Re: Octopus merge: unique (?) to git, but is it useful?

From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Jun 3, 2008, 11:53 UTC
Message-ID: <vpqlk1mu438.fsf@bauges.imag.fr>
In-Reply-To: <200806031327.52175.jnareb@gmail.com>

Jakub Narebski <jnareb@gmail.com> writes:

Show 18 quoted lines

> On Tue, 3 June 2008, Matthieu Moy wrote:
>> Jakub Narebski <jnareb@gmail.com> writes:
>> 
>>> I think that octopus merge (merge with more than two parents/legs) is 
>>> feature which is unique to git (isn't it?).  
>> 
>> bzr can do similar things:
>> 
>> bzr merge some-branch
>> bzr merge --force some-other-branch
>> bzr commit
>> 
>> Since bzr doesn't auto-commit after a merge, the above commands
>> actually creates only one revision with 3 parents (the --force is here
>> to let merge do it's job with uncommited changes in the tree).
>
> But does it store octopus merge as octopus: commit with more than
> two parents?

Yes, it's actually a single commit object with 3 parents.

-- 
Matthieu