Foreign Branches

[John Arbash Meinel]

Jan Hudec wrote:
> On Tue, Oct 18, 2005 at 21:35:35 +1000, Michael Ellerman wrote:
> 
>>On Tue, 18 Oct 2005 18:57, Johan Rydberg wrote:
>>
>>>Michael Ellerman <michael at ellerman.id.au> writes:
>>>
>>>>>the other registered branch types (such as SvnBranch, CvsBranch,
>>>>>BazBranch, etc).
>>>>
>>>>.. GitBranch ? :D
>>>
>>>I started working in that a month ago, but had to drop it because of
>>>lack of spare time, plus a nasty bug that I could not solve.
>>
>>Did you get any code working? It'd be intersting to see it.
>>
>>I had a think about what would be required but didn't get far. The problem I 
>>had was that git doesn't have a notion of "mainline" so it's not clear how to 
>>do merges. ie. does A merge into B or B into A ?
> 
> 
> I *HOPE* neither does bazaar-ng (and as far as I understand it, it
> really does not). Merges need to be symetric.
> 
> (Another thing is that git can do "octopus-merge" which has more than
> two parents. Arbirary ordering would do.)

Well, bzr has the notion of "revision-history" which is what was the
code path that *this* particular branch followed. When committing, this
is the first parent of each revision. *Except* if someone merges you,
and then you pull that revision. (Because you get the identical text to
their commit, and on their branch, their commit is the first entry).

The advantage of having "revision-history" is that it is frequently nice
to say "what has changed to Martin's bzr.dev" and you can get the list
of his commits on that branch, and can tell the difference between what
was merged in, and what was the official work. I think it is a nice balance.

bzr doesn't have any problems with an "octopus merge". If you do:

	bzr merge ../foo
	bzr merge --force ../foo2
	bzr merge --force ../foo3
	bzr merge --force ../foo4

	bzr status

You should see that there are 4 pending merges. The --force is
necessary, because by default, merge doesn't let you merge if there are
changes to your working tree.

John
=:->


> 
> --
> 						 Jan 'Bulb' Hudec <bulb at ucw.cz>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051018/261b6cb9/attachment.pgp