[Pkg-cvs-commits] r18 - in /trunk: changelog patches/95_flag_conflicted_copies

[zakame-guest at users.alioth.debian.org]

Author: zakame-guest
Date: Thu May 25 16:42:24 2006
New Revision: 18

URL: http://svn.debian.org/wsvn/?sc=1&rev=18
Log:
Try to fix #368681

Added:
    trunk/patches/95_flag_conflicted_copies
Modified:
    trunk/changelog

Modified: trunk/changelog
URL: http://svn.debian.org/wsvn/trunk/changelog?rev=18&op=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Thu May 25 16:42:24 2006
@@ -1,3 +1,12 @@
+cvs (1:1.12.13-3) unstable; urgency=low
+
+  [ Zak B. Elep ]
+  * debian/patches:
+    + Add 95_flag_conflicted_copies to avoid broken commits if
+      people don't notice it in time. (Closes: #368681).
+
+ -- Zak B. Elep <zakame at spunge.org>  Fri, 26 May 2006 00:26:57 +0800
+
 cvs (1:1.12.13-2) unstable; urgency=low
 
   [ Steve McIntyre ]

Added: trunk/patches/95_flag_conflicted_copies
URL: http://svn.debian.org/wsvn/trunk/patches/95_flag_conflicted_copies?rev=18&op=file
==============================================================================
--- trunk/patches/95_flag_conflicted_copies (added)
+++ trunk/patches/95_flag_conflicted_copies Thu May 25 16:42:24 2006
@@ -0,0 +1,41 @@
+# Undo not flagging conflicted copies anymore, as reported by
+# Henrique de Moraes Holschuh <hmh at debian.org>
+# Closes: #368681
+# Patch taken from reversal of http://cvs.savannah.nongnu.org/viewcvs/ccvs/src/classify.c?root=cvs&r1=1.25.4.2&r2=1.25.4.3&makepatch=1&diff_format=h ,
+diff -Nru ../build-tree.old/cvs-1.12.13/src/classify.c ./cvs-1.12.13/src/classify.c
+--- ../build-tree.old/cvs-1.12.13/src/classify.c	2005-09-23 11:37:42.000000000 +0800
++++ ./cvs-1.12.13/src/classify.c	2006-05-26 00:21:50.000000000 +0800
+@@ -284,9 +284,7 @@
+ 			error (0, 0, "warning: `%s' was lost", finfo->fullname);
+ 		ret = T_CHECKOUT;
+ 	    }
+-	    else if (!strcmp (vers->ts_user,
+-			      vers->ts_conflict
+-			      ? vers->ts_conflict : vers->ts_rcs))
++	    else if (strcmp (vers->ts_user, vers->ts_rcs) == 0)
+ 	    {
+ 
+ 		/*
+@@ -300,8 +298,6 @@
+ 		if (vers->entdata->options &&
+ 		    strcmp (vers->entdata->options, vers->options) != 0)
+ 		    ret = T_CHECKOUT;
+-		else if (vers->ts_conflict)
+-		    ret = T_CONFLICT;
+ 		else
+ 		{
+ 		    sticky_ck (finfo, aflag, vers);
+@@ -322,13 +318,6 @@
+ 		else
+ 		    ret = T_NEEDS_MERGE;
+ #else
+-		/* Files with conflict markers and new timestamps fall through
+-		 * here, but they need to.  T_CONFLICT is an error in
+-		 * commit_fileproc, whereas T_MODIFIED with conflict markers
+-		 * is caught but only warned about.  Similarly, update_fileproc
+-		 * currently reregisters a file that was conflicted but lost
+-		 * its markers.
+-		 */
+ 		ret = T_MODIFIED;
+ 		sticky_ck (finfo, aflag, vers);
+ #endif