Ubuntu
bzr-builddeb package

merge-package doesn't save merge branch

Bug #486075 reported by Colin Watson
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
bzr-builddeb
Fix Released
Medium
Jelmer Vernooij
bzr-builddeb 2.8.1
bzr-builddeb (Ubuntu)
Fix Released
Medium
Jelmer Vernooij

Bug Description

Binary package hint: bzr-builddeb

From the UDS demonstration: 'bzr merge-package' appears not to save the merged branch in a way such that 'bzr info' can see it, and so that the directory aliasing stuff can use it.

Related branches

lp://staging/~jelmer/bzr-builddeb/merge-package-as-hook
James Westby: Approve
Diff: 239 lines (+77/-37)
8 files modified
__init__.py (+23/-0)
cmds.py (+13/-0)
debian/NEWS (+8/-1)
debian/changelog (+3/-1)
errors.py (+1/-1)
merge_package.py (+4/-12)
tests/blackbox/test_merge_package.py (+25/-0)
tests/test_merge_package.py (+0/-22)
lp://staging/debian/bzr-builddeb
lp://staging/ubuntu/precise/bzr-builddeb
Revision history for this message
James Westby (james-w) wrote :

Thanks.

There are probably a bunch of things that merge does that merge-package
doesn't, it would be great to fix them all in one go if it is not too much work.

Even making merge-package a subclass of merge would be good.

Thanks,

James

Changed in bzr-builddeb (Ubuntu):
status: New → Triaged
importance: Undecided → Medium
Changed in bzr-builddeb:
status: New → Triaged
importance: Undecided → Medium
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: Triaged → In Progress
Changed in bzr-builddeb (Ubuntu):
status: Triaged → In Progress
Changed in bzr-builddeb:
assignee: nobody → Jelmer Vernooij (jelmer)
Changed in bzr-builddeb (Ubuntu):
assignee: nobody → Jelmer Vernooij (jelmer)
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: In Progress → Fix Committed
milestone: none → 2.8.1
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package bzr-builddeb - 2.8.1

---------------
bzr-builddeb (2.8.1) unstable; urgency=low

  * New revision specifier 'upstream:'. LP: #905728
  * Imports are now deferred in command definitions, to speed up
    commands like 'bzr bash-completion'. LP: #903650
  * Provide merge-package functionality as a hook for 'bzr merge'.
    LP: #486075, LP: #910900
  * Add pre-commit hook that warns about applied quilt patches, and can
    automatically unapply/apply all quilt patches. LP: #608670
  * Automatically unapply patches before merge operations.
    LP: #815854
  * Include full changelog paths that were checked in error message.
    LP: #811459
  * Cope with unicode strings being specified to TarfileSource. Based on
    patch by Gediminas Paulauskas. LP: #911262
  * Automatically apply patches for 3.0 (quilt) packages in 'bzr bd-do'
    and 'bzr bd'. LP: #616791
  * Switch to source format '3.0 (native)'.
  * Skip import tests for .tar.xz if not supported by pristine-tar.
    Closes: #655463, LP: #917112

 -- Jelmer Vernooij <email address hidden> Wed, 18 Jan 2012 01:24:21 +0100

Changed in bzr-builddeb (Ubuntu):
status: In Progress → Fix Released
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.