[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Problem with star-merge
From: |
Rob Weir |
Subject: |
Re: [Gnu-arch-users] Problem with star-merge |
Date: |
Tue, 26 Apr 2005 11:34:39 +1000 |
User-agent: |
Mutt/1.5.6+20040907i |
On Mon, Apr 25, 2005 at 09:38:36AM +0200, Ingo Buescher said
> So the question is: is it possible at all with tla to have merges in
> form of a net, where everybody can
> merge from everybody and tla is smart enough to figure out, which
> patches are already applied
> (because of information in the wiki I thought this was possible) or does
> tla needs a tree like
> structure with one central developer, where everybody merges from and to?
>
> And if it is possible to use tla in form of a net, any idea, what might
> have gone wrong?
As someone else explained, star-merge can't handle this situation; 'baz
merge' can handle more complicated mesh arrangments, though, perhaps
it's worth a try?
-rob
--
Words of the day: high security offensive information warfare Steve Case Merlin