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

[Markus Schiltknecht]

Hi,

Matthew Nicholson wrote:
> 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.

Yeah, something like that might work. However, the user might get 
surprised to not get the file as it was at that revision, but different 
contents - or even worse, he has to do merges before getting the file.

> 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).

That could be solved by copying as well.

Regards

Markus