[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Lele Gaifax <lele_at_seldati.it>
Date: 2002-02-20 08:52:58 CET

>>>>> On 20 Feb 2002 00:46:35 -0600, Karl Fogel <kfogel@newton.ch.collab.net> said:

    KF> Daniel Berlin <dan@dberlin.org> writes:
>> Time == bad md5 == good. Use md5 to detect the difference.
>> Record the md5 of the conflicted version.

    KF> +1

    KF> Much better idea, thanks!

Uhm, it's several years now, but I had a co-worker who apparently
wasn't able to browse the entire source looking for conflict markers,
and a few times he commited an half-resolved version of the
file... Lately I'm using CVS mostly through WinCVS (:-/), and iirc it,
or maybe it is the newest CVS, do recognize this case, and prevents
the commit to take place. And the only way is grepping for conflict

ciao, lele.

nickname: Lele Gaifax	| Quando vivro' di quello che ho pensato ieri
real: Emanuele Gaifas	| comincero' ad aver paura di chi mi copia.
email: lele@seldati.it	|		-- Fortunato Depero, 1929.
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

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.