Feedback on merging via bzr

[Michael Hudson]

Barry Warsaw wrote:
> On Jan 17, 2010, at 10:45 PM, Scott Kitterman wrote:
> 
>> At this point I want to check the package against the previous Debian and
>> Ubuntu packages to make sure I have it correct.  Traditionally, I would
>> locally debdiff the proposed merge with both the previous Debian and Ubuntu
>> packages to make sure I had documented all of the Ubuntu diff and not lost
>> any needed changes in the merge.  To do it the new way, I did:
>>
>> $bzr diff --old lp:debian/squeeze/regina-normal | less
>> ssh key
>> (repeat, including redownloading each time the diff is done)
>>
>> I assume "bzr diff --old lp:ubuntu/regina-normal" would have worked for the diff 
>>from the previous Ubuntu package, but it isn't documented and I didn't think 
>> to try it at the time.
> 
> I just asked Scott to review a change to Lucid's distribute package
> (python-distribute).  I merged debian/sid's version into the ubuntu/lucid
> version to get us to 0.6.10.  Then I committed and pushed a branch to
> lp:~barry/ubuntu/lucid/distribute/sync-to-sid
> 
> Unfortunately, the diff that's automatically generated on the merge proposal
> isn't what Scott wants for the review.  As shown above, he really wants the
> diffs between the branch and current Ubuntu, and branch and current Debian.
> Perhaps merge proposals for distro packages need a different kind of automatic
> diff?

This can probably be arranged, I guess.  File a bug.  Patches likely
welcome :-)

Cheers,
mwh