← Back to branch summary

~andrewsomething/bzr-builddeb/bzr-grab-merge

~andrewsomething/bzr-builddeb/bzr-grab-merge

Viewing all changes in revision 409.

Committer: Andrew Starr-Bochicchio
Date: 2011-05-29 01:48:04 UTC
mfrom: (393.1.168 trunk)
Revision ID: a.starr.b@gmail.com-20110529014804-4uceqevqh3mpdli3

Re-merge on trunk.

files added:
.bzrignore

dep3.py

tests/blackbox/test_dep3.py

tests/test_dep3.py

upstream

upstream/branch.py

files removed:
bzr-builddeb_0.1-1_i386.changes

changes.py

files renamed:
upstream.py => upstream/__init__.py

files modified:
README

__init__.py

cmds.py

config.py

debian/NEWS

debian/changelog

debian/control

debian/rules

dh_make.py

doc/user_manual/configuration.rst

doc/user_manual/hooks.rst

errors.py

import_dsc.py

info.py

launchpad.py

merge_package.py

merge_upstream.py

setup.py

tagging.py

tests/__init__.py

tests/blackbox/__init__.py

tests/blackbox/test_builddeb.py

tests/blackbox/test_do.py

tests/blackbox/test_import_dsc.py

tests/blackbox/test_merge_upstream.py

tests/test_config.py

tests/test_import_dsc.py

tests/test_merge_upstream.py

tests/test_repack_tarball.py

tests/test_source_distiller.py

tests/test_tagging.py

tests/test_upstream.py

tests/test_util.py

util.py

Show diffs side-by-side

added added

removed removed

bzr-builddeb_0.1-1_i386.changes

debian/changelog

doc/user_manual/configuration.rst

doc/user_manual/hooks.rst

merge_package.py

merge_upstream.py

tests/__init__.py

tests/blackbox/__init__.py

tests/blackbox/test_builddeb.py

tests/blackbox/test_dep3.py

tests/blackbox/test_do.py

tests/blackbox/test_import_dsc.py

tests/blackbox/test_merge_upstream.py

tests/test_config.py

tests/test_dep3.py

tests/test_import_dsc.py

tests/test_merge_upstream.py

tests/test_repack_tarball.py

tests/test_source_distiller.py

tests/test_tagging.py

tests/test_upstream.py

tests/test_util.py

upstream/__init__.py

upstream/branch.py

Older »