Foreign Branches

[Aaron Bentley]

-----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.

> (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.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDVPc50F+nu1YWqI0RAmtBAJ9IIG4wQxjW5TqCyrk2rqYv+5neYgCfd3ez
9NSIO6Lttv4D/Fe9QqN6704=
=oKnW
-----END PGP SIGNATURE-----