From 00e4559b612f179492ff3721f86c92498894432f Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Fri, 18 Feb 2005 22:05:58 +0000
Subject: [PATCH] Use -kk to suppress patches for $Id$ differences between
 branches.

---
 fedora/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fedora/Makefile b/fedora/Makefile
index 6d0098ac1c3..88b68eea28f 100644
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -81,7 +81,8 @@ force-tag: glibc.spec
 # Note this rule assumes that your working directory (..) is up to date.
 $(tar-name)-$(branch-name).patch: makepatch.awk glibc.spec \
 				  ../ChangeLog ../*/ChangeLog
-	(cd ..; cvs -q diff -upN $(select-snapshot) $(select-release)) | \
+# Use -kk to suppress patches for $Id$ differences between branches.
+	(cd ..; cvs -q diff -kk -upN $(select-snapshot) $(select-release)) | \
 	awk -v OLDVER=$(tar-name)-$(snapshot-name) \
 	    -v NEWVER=$(tar-name)-$(snapshot-name)-$(branch-name) \
 	    -f $< > patch.tmp
-- 
2.47.2