[packages/cvs.git] / cvs-debian-flag-conflicted-copies.patch

# Undo not flagging conflicted copies anymore, as reported by
# Henrique de Moraes Holschuh <hmh@debian.org>
# Closes: #368681
# 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 (!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)
     {
 	if (args->no_contents
 	    && supported_request ("Is-modified"))
Commit	Line	Data
3a862a5e AM	1	# Undo not flagging conflicted copies anymore, as reported by
	2	# Henrique de Moraes Holschuh <hmh@debian.org>
	3	# Closes: #368681
	4	# Fix as described in message to the CVS mailing list at
	5	# http://lists.gnu.org/archive/html/info-cvs/2006-06/msg00050.html
	6	--- cvs-1.12.13/src/client.c~ 2005-10-02 16:17:20.000000000 +0100
	7	+++ cvs-1.12.13/src/client.c 2006-06-09 20:12:06.000000000 +0100
	8	@@ -4533,10 +4533,9 @@
	9	/* File no longer exists. Don't do anything, missing files
	10	just happen. */
	11	}
	12	- else if (!vers->ts_rcs \|\| args->force
	13	- \|\| strcmp (vers->ts_conflict
	14	- ? vers->ts_conflict : vers->ts_rcs, vers->ts_user)
	15	- \|\| (vers->ts_conflict && !strcmp (cvs_cmd_name, "diff")))
	16	+ else if (vers->ts_rcs == NULL
	17	+ \|\| args->force
	18	+ \|\| strcmp (vers->ts_user, vers->ts_rcs) != 0)
	19	{
	20	if (args->no_contents
	21	&& supported_request ("Is-modified"))