Foreign Branches

[Jan Hudec]

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

--
						 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/17bb983b/attachment.pgp