[Gnu-arch-users] Re: Future of GNU Arch, bazaar and bazaar-ng ... ?
Jan Hudec
bulb at ucw.cz
Sun Aug 21 17:51:30 BST 2005
On Sun, Aug 21, 2005 at 12:41:57 -0400, Aaron Bentley wrote:
> Jan Hudec wrote:
> > And what about Bazaar-NG and changesets? Will the merge in bazaar-ng store
> > just the collapsed patch (as arch/bazaar do) or the constituents and
> > a resolution (as git and mercurial do)?
>
> When you merge a revision (let's call it 'A'), all available ancestors
> of A are also stored. Note that in bzr,
>
> If A is a descendant of your last commit (let's call it B), we'll simply
> mark A as the latest revision in your branch. Otherwise, you'll have to
> commit the changes in your working tree. That commit will produce a
> revision (let's call it 'C') with two ancestors: A and B.
>
> This allows for convergence, since the person who created A can merge
> your changes, and since C is a descendant of A, which is the last commit
> in their branch, C will become their latest revision.
Thanks for the clarification.
So it behaves similarly to git and mercurial (and monotone), except mercurial
(but not git) will not insist on merging immediately.
-------------------------------------------------------------------------------
Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050821/6554a86a/attachment.pgp
More information about the bazaar
mailing list