Re: [Monotone-devel] Mark merge for existence

[Markus Schiltknecht]

Hi,

William Uther wrote:
> Are you expecting that revision X includes the content changes made in 
> revision W or not?

Certainly not, because fileA got copied from rev A.

> If you're not, then I'm not sure it makes a great un-delete.  It is an 
> ok work-around, but not perfect.

I see your point.

> If you are expecting that those changes get merged in, then you have to 
> keep track of which sets of node IDs are equal, and you have to decide 
> whether the original delete gets merged in.

Yup.

> It is... making rosters dynamic when there are deleted nodes.  All of 
> that same machinery is used, just not stored in the DB.

Well, okay. Sounds better ;-)

Regards

Markus