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

[93sam at users.alioth.debian.org]

Author: 93sam
Date: Sat Jun 10 15:38:47 2006
New Revision: 20

URL: http://svn.debian.org/wsvn/?sc=1&rev=20
Log:
Fix 95_flag_conflicted_copies - patch from upstream
(http://lists.gnu.org/archive/html/info-cvs/2006-06/msg00050.html) to
fix breakage in conflict handling. Closes: #368681


Modified:
    trunk/changelog
    trunk/patches/95_flag_conflicted_copies

Modified: trunk/changelog
URL: http://svn.debian.org/wsvn/trunk/changelog?rev=20&op=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Sat Jun 10 15:38:47 2006
@@ -1,13 +1,16 @@
 cvs (1:1.12.13-3) unstable; urgency=low
 
+  [ Steve McIntyre ]
+  * debian/patches:
+    + Add 95_flag_conflicted_copies - patch from upstream to fix breakage in
+    conflict handling. Closes: #368681
+	
   [ Zak B. Elep ]
   * debian/patches:
-    + Add 95_flag_conflicted_copies to avoid broken commits if
-      people don't notice it in time. (Closes: #368681)
     + Add 12_rcs2log_POSIX_sort to let rcs2log use unambigous sort
       flags. (Closes: #368909)
 
- -- Zak B. Elep <zakame at spunge.org>  Fri, 26 May 2006 15:22:46 +0800
+ -- Steve McIntyre <93sam at debian.org>  Fri, 09 Jun 2006 20:13:53 +0100
 
 cvs (1:1.12.13-2) unstable; urgency=low
 

Modified: trunk/patches/95_flag_conflicted_copies
URL: http://svn.debian.org/wsvn/trunk/patches/95_flag_conflicted_copies?rev=20&op=diff
==============================================================================
--- trunk/patches/95_flag_conflicted_copies (original)
+++ trunk/patches/95_flag_conflicted_copies Sat Jun 10 15:38:47 2006
@@ -1,41 +1,21 @@
 # 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;
+# Fix as described in message to the CVS mailing list at
+# http://lists.gnu.org/archive/html/info-cvs/2006-06/msg00050.html
+--- cvs-1.12.13/src/client.c~	2005-10-02 16:17:20.000000000 +0100
++++ cvs-1.12.13/src/client.c	2006-06-09 20:12:06.000000000 +0100
+@@ -4533,10 +4533,9 @@
+ 	/* File no longer exists.  Don't do anything, missing files
+ 	   just happen.  */
  	    }
--	    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)
+-    else if (!vers->ts_rcs || args->force
+-	     || strcmp (vers->ts_conflict
+-		        ? vers->ts_conflict : vers->ts_rcs, vers->ts_user)
+-	     || (vers->ts_conflict && !strcmp (cvs_cmd_name, "diff")))
++    else if (vers->ts_rcs == NULL
++             || args->force
++             || 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
+ 	if (args->no_contents
+ 	    && supported_request ("Is-modified"))