[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] Re: Future of GNU Arch, bazaar and bazaar-ng ... ?

From: Jan Hudec
Subject: Re: [Gnu-arch-users] Re: Future of GNU Arch, bazaar and bazaar-ng ... ?
Date: Sun, 21 Aug 2005 18:51:30 +0200
User-agent: Mutt/1.5.10i

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 

Attachment: signature.asc
Description: Digital signature

reply via email to

[Prev in Thread] Current Thread [Next in Thread]