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 <[EMAIL
PROTECTED]>
signature.asc
Description: Digital signature
_______________________________________________ Gnu-arch-users mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
