preparing migration from baz to bzr

[Robert Collins]

On Wed, 2005-10-19 at 16:14 +0200, David Allouche wrote:
..
> The second use case is merging from upstream, while keeping my changes
> on top of the branch and potentially updating them for conflicts. 
> 
>        (applies C)
> dev   A---> D -> E -> F
>        \               \       
> ddaa    `-> B -> C      `-> G -> H
>              \    \      /    /
>               `----\----'    /
>                     \       /
>                      `-----'
> 
> After the merging, ddaa's history ends in ADEFGH.
> 
> I pushed C, I want to push H.


This sounds exactly how I would expect 'CVS mode' to work - when you
'pull' a cvs-mode branch will take the 'central branchs'
revision-history always, so that you are seeing the same log as everyone
else. (And you would have to converge branches as normal).

So - get cvs-mode working, and then it should be trivial :).

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051023/bdb5a56a/attachment.pgp