Ignore altered "pgtranslation Id" lines as well when diffing.
authorPeter Eisentraut <peter_e@gmx.net>
Thu, 31 Jan 2008 17:58:05 +0000 (17:58 +0000)
committerPeter Eisentraut <peter_e@gmx.net>
Thu, 31 Jan 2008 17:58:05 +0000 (17:58 +0000)
cp-po

diff --git a/cp-po b/cp-po
index 92e9afea1c29d72b7417647c4699827a604420de..a9620061d442e8dd361fb1822141ff807442506b 100755 (executable)
--- a/cp-po
+++ b/cp-po
@@ -61,7 +61,7 @@ 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\|Id\|PostgreSQL\):.*\$' $srcfile $targetfile >/dev/null; then
+                       if [ ! -e $targetfile ] || ! diff -I '\(\$Header\|pgtranslation Id\|\$Id\|\$PostgreSQL\):.*\$' $srcfile $targetfile >/dev/null; then
                                echo " $srcfile --> $targetfile"
                                $run && { cat $srcfile | sed 's/^\(# *\)$Id/\1pgtranslation Id/' >$targetfile; chmod 644 $targetfile; }
                        fi