Re: diff3 followups

Kevin Pilch-Bisson <kevin@pilch-bisson.net> writes:
> Honestly, I don't like the idea of just the timestamp. I think it would be
> good to record a checksum instead. That way at least the file must actually
> be modified. The other option would be to grep the file for the conflict
> markers, but I think that is overkill. Other's have pointed out times when
> they might want to actually check in a conflicted file, but I don't want to
> make it too easy.

Oh, checksum is definitely better, thanks for pointing it out. If the
goal is to determine whether the file has been modified, nothing beats
a checksum. To be really complete, we'd record

   - a timestamp
   - a file size
   - a checksum

in the entry, to get the most efficient possible modifiedness check.

-K

---------------------------------------------------------------------
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:45:31 2002