Feedback on merging via bzr

[Mathias Gug]

Hi,

On Mon, Jan 18, 2010 at 9:24 AM, Dmitrijs Ledkovs
<dmitrij.ledkov at gmail.com> wrote:
>
> $bzr init-repo package
> $cd package
> $bzr branch lp:ubuntu/package lucid
> $bzr branch lp:debian/package squeeze
>
[...]
>>
>> 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)
>>
>
> At this point in the package/lucid branch you have all package
> revisions and tags so you can do this :
>
> $bzr diff -r tag:0.1-3ubuntu5      #debdiff against old ubuntu
> $bzr diff -r tag:0.1-6                 #debdiff against debian
>
> Or any package release for that matter..... see $bzr tags
>

I usually use the ancestor revision shortcut for selecting the revision to diff:

Ubuntu patch compared to the common base version:

~/src/pkg-name/lucid/ $ bzr diff -rancestor:../squeeze/

Debian patch compared to the common base version:

~/src/pkg-name/squeeze/ $ bzr diff -rancestor:../lucid/

These two commands should generate the equivalent of the .patch files from MoM.

-- 
Mathias Gug
Ubuntu Developer  http://www.ubuntu.com