Re: Installing changes from branches

[Óscar Fuentes]

Eli Zaretskii <address@hidden> writes:

>> Date: Sat, 03 Apr 2010 19:29:56 +0300
>> From: Eli Zaretskii <address@hidden>
>> Cc: address@hidden
>> 
>>       cd ../test
>>       bzr merge --pull
>>       [hack away, test, hack some more, until ready to go public]
>>       bzr diff > ../foo
>
> One possible variation at this point, important if I made local
> commits to the test branch while working on this particular feature:
>
>    bzr diff -rsubmit: > ../foo
>
> The revision designated by `submit:' is the last common ancestor
> between the trunk and the test branch, i.e. the last point where I
> last re-synced with the trunk.  This is exactly the changes I made
> that are not on the trunk.

If you use `bzr diff' and `patch' for incorporating your changes into
`trunk', bzr is unable to track. So you `bzr diff -rsubmit:' will
generate a diff as if you had never incorporated your local changes into
`trunk'.