Re: diff3 followups

Ben Collins-Sussman <sussman@collab.net> writes:
> * if a conflict occurs, users now have to hand-remove *three* backup
> files (instead of a single .rej file). if people think this is too
> burdensome, maybe we can just do timestamp comparisons instead --
> i.e., if the user has touched the file since the conflict, assume
> the conflict is gone. Is this preferable?

So the plan would be:

   - The commit succeeds if the user has touched the working file
     since it received the conflict, otherwise the commit bombs
     complaining of an unresolved conflict. And, after a commit of
     the working file succeeds, we clean up the three "backup"
     fulltexts.

Sounds good to me...

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 14 01:33:13 2002