From 8f8c3ab303df2c3b9898983256d6412d9508f88a Mon Sep 17 00:00:00 2001
From: Yann Dirson <ydirson@free.fr>
Date: Sat, 4 Sep 2004 12:34:30 +0000
Subject: [PATCH] fixed po2po to avoid missing messages, and avoid confusing
 cvs

---
 utils/po2po | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utils/po2po b/utils/po2po
index c594ef60037..778164884ea 100755
--- a/utils/po2po
+++ b/utils/po2po
@@ -23,7 +23,7 @@ tmp=`tempfile`
 for LANG in "$@"
 do
     # merge the 2 files
-    msgcat --use-first -F po/$LANG/$DSTDOMAIN.po po/$LANG/$SRCDOMAIN.po >$tmp
+    msgcat -F po/$LANG/$DSTDOMAIN.po po/$LANG/$SRCDOMAIN.po >$tmp
     mv po/$LANG/$DSTDOMAIN.po po/$LANG/$DSTDOMAIN.po.bak
     mv $tmp po/$LANG/$DSTDOMAIN.po
 
@@ -37,5 +37,8 @@ do
 
     touch -d '1970-01-02' po/$LANG/$DSTDOMAIN.po
     make -C po $LANG/$DSTDOMAIN.po
+
+    # make sure the timestamp is fixed or cvs gets confused
+    touch po/$LANG/$DSTDOMAIN.po
 done
 rm $tmp