diff options
| author | Roland McGrath <roland@gnu.org> | 2005-02-18 22:05:26 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-02-18 22:05:26 +0000 |
| commit | bb50f56cd3aebc70b3711d3e518546d8945ef98b (patch) | |
| tree | ebb82d14a97ee283720564211a86094a5a366a93 | |
| parent | ee5156bbe88f875c3e950ab268fca13c46c247f9 (diff) | |
Use -kk to suppress patches for $Id$ differences between branches.
| -rw-r--r-- | fedora/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fedora/Makefile b/fedora/Makefile index 2796363eba..9bde561c00 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 |