lp:~siretart/bzr-builddeb/merge-upstream
Created by
Reinhard Tartler
and last modified
- Get this branch:
- bzr branch lp:~siretart/bzr-builddeb/merge-upstream
Only
Reinhard Tartler
can upload to this branch. If you are
Reinhard Tartler
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Branch information
Recent revisions
- 111. By James Westby
-
Merge trunk.
* Includes deprecation of local.conf, and fixes requiring new python-debian
and python-deb822. - 110. By James Westby
-
Add the start of a testsuite for the merge upstream code.
* Move the code out to its own function to ease testing.
* Test merging in normal mode from a tarball, both when the merge
is clean and conflicts are generated. - 108. By Reinhard Tartler
-
first working version of cmd_merge_upstream.
implemented other helper and playground commands, not intended for end user use. - 103. By James Westby
-
* Update the dependency on bzr to reflect the compatibility of this release.
(Closes: #421041)