Feedback on merging via bzr
Scott Kitterman
ubuntu at kitterman.com
Mon Jan 18 21:50:41 GMT 2010
> <forgot mailing list sorry silly gmail>
So then you get to read the reply twice. ;-)
>
> ---------- Forwarded message ----------
> From: Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com>
> Date: 2010/1/18
> Subject: Re: Feedback on merging via bzr
> To: Scott Kitterman <ubuntu at kitterman.com>
>
>
> 2010/1/18 Scott Kitterman <ubuntu at kitterman.com>:
>>> 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.
>>>
>> That doesn't solve the issue with the data being local versus remote,
>> but
>> it definitely looks very helpful. Â Would you add that to the wiki page
>> on
>> merging?
>>
>> Scott K
>>
>
> What do you mean? These commands _do not_ require access to remote
> branches at all! It's all local no trips to launchpad.....
I'd missed that he was working from local checkouts when I read the message.
Scott K
More information about the ubuntu-distributed-devel
mailing list