I think this gets the check-po script working properly. Sorry for all

the commits, but I need a clean tree to test it!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39103 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/tools/check-po.sh b/development/tools/check-po.sh
index a16c089f975aef3642d085bc1673ed5c204885c5..e4df55db84f55b6b82d9babae88357527d92c971 100644 (file)
--- a/development/tools/check-po.sh
+++ b/development/tools/check-po.sh
@@ -65,16 +65,22 @@ echo Remerging...
 make update-po >/dev/null 2>&1;
 echo
 
-echo Running make i18n.inc...
-rm -f i18n.inc;
-make i18n.inc  >/dev/null 2>&1;
 if [ -n "$TRUNK" ]; then
-  mv i18n.inc i18n_trunk.inc
   I18NFILE=i18n_trunk.inc;
 else
   I18NFILE=i18n.inc;
 fi
 
+# make sure things are clean
+rm -f i18n.inc;
+svn revert $FARM/$I18NFILE;
+
+echo Running make i18n.inc...
+make i18n.inc  >/dev/null 2>&1;
+if [ -n "$TRUNK" ]; then
+  mv i18n.inc i18n_trunk.inc
+fi
+
 if diff -w -q $I18NFILE $FARM/$I18NFILE >/dev/null 2>&1; then
   # No differences found
   echo No string differences found.