rpms/cvs/devel cvs-1.11.22-diff-rm.patch, NONE, 1.1 cvs.spec, 1.56, 1.57

[Jiří Moskovčák (jmoskovc)]

Author: jmoskovc

Update of /cvs/extras/rpms/cvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15608

Modified Files:
	cvs.spec 
Added Files:
	cvs-1.11.22-diff-rm.patch 
Log Message:
Fixed diff on localy removed file when tag "-r BASE" is used.
resolves: #242049


cvs-1.11.22-diff-rm.patch:

--- NEW FILE cvs-1.11.22-diff-rm.patch ---
diff -urp cvs-1.11.22/src/diff.c cvs-1.11.22mzk/src/diff.c
--- cvs-1.11.22/src/diff.c	2007-07-30 10:35:13.000000000 +0200
+++ cvs-1.11.22mzk/src/diff.c	2007-07-30 10:27:34.000000000 +0200
@@ -503,7 +503,7 @@ diff_fileproc (callerdat, finfo)
     user_file_rev = 0;
     vers = Version_TS (finfo, NULL, NULL, NULL, 1, 0);
 
-    if (diff_rev2 != NULL || diff_date2 != NULL)
+    if ((diff_rev2 != NULL || diff_date2 != NULL) && strcmp(diff_rev1,TAG_BASE)!=0 && strcmp(diff_rev2,TAG_BASE)!=0)
     {
 	/* Skip all the following checks regarding the user file; we're
 	   not using it.  */


Index: cvs.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- cvs.spec	16 Jul 2007 11:57:06 -0000	1.56
+++ cvs.spec	22 Aug 2007 13:33:21 -0000	1.57
@@ -6,7 +6,7 @@
 Summary: A version control system
 Name: cvs
 Version: 1.11.22
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -43,6 +43,7 @@
 Patch15: cvs-1.11.21-sort.patch
 Patch16: cvs-1.11.22-free.patch
 Patch17: cvs-1.11.22-ipv6-proxy.patch
+Patch18: cvs-1.11.22-diff-rm.patch
 
 
 %description
@@ -82,6 +83,7 @@
 %patch15 -p1 -b .env
 %patch16 -p1 -b .free
 %patch17 -p1 -b .ipv6
+%patch18 -p1 -b .diff-rm
 
 # Apply a patch to the generated files, OR
 # run autoreconf and require autoconf >= 2.58, automake >= 1.7.9
@@ -159,6 +161,10 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Mon Jul 30 2007 Jiri Moskovcak <jmoskovc at redhat.com> - 1.11.22-11
+- fix diff on removed file when "-r BASE" tag is used
+- Resolves: #242049
+
 * Fri Jun 15 2007 Stepan Kasal <skasal at redhat.com> - 1.11.22-10
 - make sccs2rcs non-executable, so that find-requires does not add
   dependency on /bin/csh when /bin/csh is available