lp:~siretart/bzr-builddeb/merge-upstream

Created by Reinhard Tartler on 2007-06-19 and last modified on 2007-06-19
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

Related bugs

Related blueprints

Branch information

Owner:
Reinhard Tartler
Project:
bzr-builddeb
Status:
Development

Recent revisions

112. By Reinhard Tartler on 2007-06-22

first implementation of 'import quilt patches'

111. By James Westby on 2007-06-21

Merge trunk.

  * Includes deprecation of local.conf, and fixes requiring new python-debian
    and python-deb822.

110. By James Westby on 2007-06-21

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.

109. By Reinhard Tartler on 2007-06-21

remove unneeded commands

108. By Reinhard Tartler on 2007-06-21

first working version of cmd_merge_upstream.
implemented other helper and playground commands, not intended for end user use.

107. By Reinhard Tartler on 2007-06-18

merge changes from unstable branch

106. By Reinhard Tartler on 2007-06-18

last work in progress state of hacksession in the night venue

105. By Reinhard Tartler on 2007-06-17

first version of an merge upstream command

104. By James Westby on 2007-05-03

* Take the package under the wing of pkg-bazaar.

103. By James Westby on 2007-05-03

* Update the dependency on bzr to reflect the compatibility of this release.
  (Closes: #421041)

This branch contains Public information 
Everyone can see this information.

Subscribers

No subscribers.