Re: [Monotone-devel] Re: Two seperate setups caused problems?

[Daniel Lakeland]

On Tue, Nov 21, 2006 at 01:18:35PM +1100, Brian May wrote:
> >>>>> "Daniel" == Daniel Lakeland <address@hidden> writes:

> This is something to watch with Monotone, if two people create the
> same branch at the same time... "I thought you wanted me to create
> it?" "No - I told you I was going to create it!" [...] "What do you
> mean you have almost finished? I have almost finished too. We should
> use my version!" "No - my version is better!" "You haven't even looked
> at my version!" " No - but mine is better!"
> 
> Solving this is outside the scope of Monotone though.

Solving the confusion is outside the scope of monotone, but monotone
needs a way to resolve its own internal structures so that one can
recover from such things. 

I think my case where the root is the location of the problem is a bit
of a special case, which nevertheless needs to be solved, however in
your example, where there are two branches with the same name created
from presumably a normal non-root branch, it should be possible to
rename the branches so that the merge is at least from one branch to
the other rather than from two different branches with the same name.

I think this is what merge_into_dir is about?? but in any case it
would be good to have some features in the program as well as guidance
in the documentation as to how to solve this all too easily created
problem.



-- 
Daniel Lakeland
address@hidden
http://www.street-artists.org/~dlakelan