Re: conflicts, history, and the Principle Of Least Surprise

On 20 Feb 2002, Karl Fogel wrote:
>
> The conflict time is recorded in .svn/entries. At commit time, we
> error if the working file has not been modified since the conflict.
> Otherwise, we allow the commit, and automatically remove the other
> three files (which are just sitting in the working directory with
> intuitive extensions).
Time == bad
md5 == good.
Use md5 to detect the difference.
Record the md5 of the conflicted version.

--Dan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:09 2006