Foreign Branches

[Jan Hudec]

On Tue, Oct 18, 2005 at 09:23:05 -0400, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Jan Hudec wrote:
> 
> >>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.
> 
> Mainline/not-mainline is a branch property, not a property of the
> revision itself.
> 
> There is a hint, though; in bzr, the branch-previous ancestor is always
> the first one listed.

That sounds reasonable.

And means there is no problem with git not having a concept of mainline,
since it is not that important -- simply make the first parent in git the
first parent in bzr.

> > (Another thing is that git can do "octopus-merge" which has more than
> > two parents. Arbirary ordering would do.)
> 
> bzr can represent a merge with >2 parents.  You can perform multiple
> merges (though not by default) before committing.

Thanks for clarification. I new others had a problem with this, so I just
asked.

--
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051018/1bea38b4/attachment.pgp