Use -kk to suppress patches for $Id$ differences between branches.

diff --git a/fedora/Makefile b/fedora/Makefile
index 6d0098ac1c33713b323666a5b8ab7a5a8fccf8d3..88b68eea28f0e9d6a458d299b865cfa6ff7aa227 100644 (file)
--- 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