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

This commit is contained in:
Roland McGrath 2005-02-18 22:05:58 +00:00
parent 15d734b9a0
commit 00e4559b61

View File

@ -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