Re: [Monotone-devel] What are rosters?

[William Uther]

On 22/08/2007, at 2:40 PM, Brian May wrote:

> > > > > > "William" == William Uther  
> > > > > > <address@hidden> writes:
>
>     William> If we just do what I said above, then we'd lose  
> history.  We'd also
>     William> need to make sure that the revision we resurrect the  
> node from is a
>     William> parent of the new revision generated.  This might be  
> best done by
>     William> cloning merge_into_dir quite closely, and so the  
> resurrect command
>     William> would actually commit its own revision rather than  
> being a workspace
>     William> command.  This is probably ok as you can use revert to  
> get back a
>     William> file that you've deleted but not committed yet.
>
> Would this still work even if the undeleted file is deleted again?

The goal is for monotone to treat the existence of the file the same  
way it treats renames.

Make a file called "exists".  In your example, rename it to  
"notExists" to "delete" it.  Rename it back to "exists" to "undelete"  
it.  See what happens when you merge.

This may help: http://revctrl.org/MarkMerge
or this: http://monotone.ca/docs/Mark_002dMerge.html

Be well,

Will       :-}