On Nov 1, 2004, at 8:13 PM, Øyvind A. Holm wrote:
>
> One thing I'd add is that it's only files which contains a keyword that
> get into a state of conflict. In the case of irssi, the only files with
> keywords are /trunk/scripts/mail.pl and /trunk/irssi.spec.in , and both
> of these creates a conflict.
>
Forget about the conflict. There's something fishier here. After
setting 'use-commit-times = yes', do a checkout of the irssi trunk.
'svn status' and 'svn diff' show local mods on the virgin working copy!
cvs2svn people: any idea what's going on here?
Øyvind is right -- if you turn off 'use-commit-times', then the local
mods don't show up.
[sussman@BenBook:~/scratch/trunk]$ svn st
M scripts/mail.pl
M irssi.spec.in
[sussman@BenBook:~/scratch/trunk]$ svn diff
Index: scripts/mail.pl
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/x-perl
Index: irssi.spec.in
===================================================================
--- irssi.spec.in (revision 3677)
+++ irssi.spec.in (working copy)
@@ -1,4 +1,4 @@
-# $Revision: 1.14 $, $Date: 2003/11/17 20:43:05 $
+# $Revision: 1.14 $, $Date$
Name: irssi
Version: @VERSION@
Release: 1
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 2 17:43:34 2004