rpms/cvs/devel cvs-1.11.22-diff-rm.patch, 1.1, 1.2 cvs.spec, 1.57, 1.58

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

Author: jmoskovc

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

Modified Files:
	cvs-1.11.22-diff-rm.patch cvs.spec 
Log Message:
Fixed problem with cvs diff when diffing removed files.


cvs-1.11.22-diff-rm.patch:

Index: cvs-1.11.22-diff-rm.patch
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/cvs-1.11.22-diff-rm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvs-1.11.22-diff-rm.patch	22 Aug 2007 13:33:21 -0000	1.1
+++ cvs-1.11.22-diff-rm.patch	17 Sep 2007 15:04:20 -0000	1.2
@@ -1,12 +1,18 @@
-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)
+--- cvs-1.11.22/src/diff.c	2007-09-17 16:55:18.000000000 +0200
++++ cvs-1.11.22/src/diff.c.usercheck	2007-09-17 16:55:28.000000000 +0200
+@@ -502,13 +502,8 @@ 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.  */
+-    }
+-    else if (vers->vn_user == NULL)
++    
++    if (vers->vn_user == NULL)
      {
- 	/* Skip all the following checks regarding the user file; we're
- 	   not using it.  */
+ 	/* The file does not exist in the working directory.  */
+ 	if ((diff_rev1 != NULL || diff_date1 != NULL)


Index: cvs.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- cvs.spec	22 Aug 2007 13:33:21 -0000	1.57
+++ cvs.spec	17 Sep 2007 15:04:20 -0000	1.58
@@ -6,7 +6,7 @@
 Summary: A version control system
 Name: cvs
 Version: 1.11.22
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -161,6 +161,10 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Mon Sep 17 2007 Jiri Moskovcak <jmoskovc at redhat.com> - 1.11.22-12
+- rewriten previous patch when trying to diff  removed files
+- Resolves: #277501, #242049
+
 * 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