When cvs update produces conflicts, remove them and try again. This always

happens when adding new PO files to the PostgreSQL CVS for the first time.

diff --git a/wwwtools/update-nls-www b/wwwtools/update-nls-www
index 1597adeb774a4ab16d68effd2b7cc17b1c847b85..1b3b21fac886be3a13f3cf2091d0393f6c7fc278 100755 (executable)
--- a/wwwtools/update-nls-www
+++ b/wwwtools/update-nls-www
@@ -38,6 +38,10 @@ for branch in $active_branches; do
        pushd $PGSRC
        test -f GNUmakefile && $GMAKE maintainer-clean
        cvs -q update | tee "$tmp"
+       if egrep -q '^C ' "$tmp"; then
+               rm $(sed -n 's/^C //p' "$tmp")
+               cvs -q update | tee "$tmp"
+       fi
        popd
 
        if [ -d "$CVSDIR/messages-$branch" ]; then