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

[Martin Pool]

On 8/21/05, Jan Hudec <address@hidden> wrote:

> To state a more precise definition, Bazaar-NG only allows one head in
> a given tree (each working copy is a branch and vice versa, so I'll call it
> together a tree) at any given time. So if what you pull is descendant of your
> current head, you end up with one head and all is right, but if it isn't, you
> have to merge and commit before doing anything else.

That's correct.

> GIT seems to insist on the merge (allow only one head), but allow to have
> several named branches is one working copy, each of them with it's own head.
> This can serve as a built-in cache of the remote branches. AFAIK Cogito does
> not handle these other branches.
> 
> On another side-note, git allows to have arbitrary number of parents for
> a revision, while mercurial allows at most two (at the current state). The
> mercurial folks had to solve this in their git->mercurial gateway some time
> ago.

Our model allows for any number of parents, though I'd expect 1 or 2
to be the most common case.

-- 
Martin