bzr-builddeb

Merge lp://staging/~maxb/bzr-builddeb/graph-heads-misuse into lp://staging/bzr-builddeb

  1. graph-heads-misuse
  2. Merge into trunk
Proposed by Max Bowsher
Status: Merged
Approved by: James Westby
Approved revision: 562
Merged at revision: 562
Proposed branch: lp://staging/~maxb/bzr-builddeb/graph-heads-misuse
Merge into: lp://staging/bzr-builddeb
Diff against target: 65 lines (+10/-16)
1 file modified
import_dsc.py (+10/-16)
To merge this branch: bzr merge lp://staging/~maxb/bzr-builddeb/graph-heads-misuse
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+63337@code.staging.launchpad.net

Description of the change

Via some weirdness in the rxtx UDD import (mentioned in bug 785859), I discovered some code which assumes that:

   len(graph.heads([A, B])) == 1

means that it is safe to pull A into a branch currently at B.

This, however, fails to take into account whether A is an ancestor of B, or B is an ancestor of A.

The end result was that the importer elided the Ubuntu-specific history from the oneiric branch after a ./requeue_package.py --full, pulling the Debian revision corresponding to a synced package version into the Ubuntu branch.

The fix is simply to take account of *which* of A and B is the head.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve
Revision history for this message
James Westby (james-w) wrote :

Nice catch Max, thanks.

James

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches