[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] Problem with star-merge

From: Ingo Buescher
Subject: Re: [Gnu-arch-users] Problem with star-merge
Date: Tue, 26 Apr 2005 11:25:55 +0200
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20041217

Rob Weir wrote:
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?


I'd like to give baz a try, but since we are using windows as our main developer plattform I have to wait until a win32 version is available - so far I was using the native win32 port of tla (version 1.3) and have switched
to the cygwin version of tla-1.3.1 today.

Ingo Buescher

reply via email to

[Prev in Thread] Current Thread [Next in Thread]