Launchpad itself

  1. Bug #509901
  2. Comment #1

Comment 1 for bug 509901

Revision history for this message
Dimitri John Ledkov (xnox) wrote : Re: Distro package merge proposals need different diffs

https://code.edge.launchpad.net/~barry/ubuntu/lucid/distribute/sync-to-sid/+merge/17425
Original merge proposal.

https://code.edge.launchpad.net/~dmitrij.ledkov/ubuntu/lucid/distribute/sync-to-sid/+merge/17728
Merge proposal with lp:debian/sid/distribute set as prerequiste.

Note the source branch is direct ancestor of the sid branch. You can do bzr pull the proposed source branch from target.

But the diff generated by launchpad has merge conflicts. Expected is the output of bzr diff --new lp:debian/sid/distribute but it's not.

I'll attach these branches and lp diff output in a moment.