From 2943a0fa613f2dd147abbfdbaaefd6d4ac559c0d Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Sun, 14 Jun 2009 05:33:35 +0000
Subject: [PATCH] When not adjusting cvs keywords, overwrite the target file
 even if the only difference is the cvs keyword line.  This is so that they
 keyword adjusted files from PostgreSQL CVS don't appear on the web site.

---
 cp-po | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cp-po b/cp-po
index 0077f73..93d19c3 100755
--- a/cp-po
+++ b/cp-po
@@ -69,7 +69,9 @@ for srcfile in $(find "$srcdir" -name '*.po'); do
 			if [ ! -e $targetfile ]; then
 				echo "NEW: $targetfile --- file will be copied, but do \"cvs add\" and fix $y by hand" 1>&2
 			fi
-			if [ ! -e $targetfile ] || ! diff -I '\(\$Header\|pgtranslation Id\|\$Id\|\$PostgreSQL\).*\$' $srcfile $targetfile >/dev/null; then
+			if [ ! -e $targetfile ] \
+			   || { ! $adjustcvskeywords && ! diff $srcfile $targetfile >/dev/null; } \
+			   || ! diff -I '\(\$Header\|pgtranslation Id\|\$Id\|\$PostgreSQL\).*\$' $srcfile $targetfile >/dev/null; then
 				echo " $srcfile --> $targetfile"
 				mkdir -p $(dirname $targetfile)
 				if $run; then
-- 
2.39.5