Re: [Monotone-devel] resolving name conflicts; file suturing vs drop

[Matthew Nicholson]

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.

I suppose that could be a little complicated, but as you said it could 
be something like:

mtn ls dead foo
mtn resurrect a1b2c3f foo

The ls dead command would show dropped nodes by file name and the 
revision they were dropped in, the mtn res command would resurrect them.

Also UI wise, the obvious resurrection case is when a revision with 
dropped nodes is reverted/disapproved, those nodes should come back, 
right now they don't (they are replaced with new nodes with the same 
content).


--
Matthew Nicholson
matt-land.com