|
From: | William Uther |
Subject: | Re: [Monotone-devel] resolving name conflicts; file suturing vs drop |
Date: | Fri, 9 May 2008 10:35:47 +1000 |
On 08/05/2008, at 9:09 PM, Markus Schiltknecht wrote:
Hi, William Uther wrote:An example: how is bob expected to resurrect a file "foo", which got overridden by another node id which is now called "foo". I can only think of something like "take file 'foo' from rev '1234..' but name it 'bar'", which will quite certainly make bob become crazybob.That looks much like subversion's copy feature. I think that would make merging hard for monotone. It is a complete break with the current 'mark-merge' philosophy.I was trying to say that it's hard for the user to specify which node id she wants to resurrect, in case its filename got reused by another node. It's an argument against concentrating on node ids, and has not much to do with the implementation.
Ahh - for implementation you need to concentrate on node-ids. I agree that node-ids are NOT the UI you want :).
Be well, Will :-}
[Prev in Thread] | Current Thread | [Next in Thread] |