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

[Thomas Moschny]

Markus Schiltknecht wrote:
> William Uther wrote:
> > This isn't totally correct.  You need the node-id's you're talking
> > about, but you also need the marks for mark-merge.  As has been noted by
> > Thomas in another email, the problem with resurrection isn't with
> > finding the node-id, it is with being able to get the marks when you
> > later do the merge.  At the moment we don't keep the marks when we drop
> > a file.
>
> With suturing + copying, as I'm envisioning, we don't need to keep them.

Yes, we do need them, that's pretty much sure (or, at least, we need to 
reconstruct them on demand, as William suggests). They are needed for killing 
DieDieDie. You can always (without having resurrection in the extended, 
copy-like sense!) go back to an old revision, where the file was still alive, 
make a new child (changing the file maybe) and merge that with current head. 
Currently, this won't bring the file back, but it should. And for this to 
work, we need the markings.

Note: This is a basic problem to be solved independently and probably not 
related at all to the discussion we are having here.

Regards,
Thomas

signature.asc
Description: This is a digitally signed message part.