Create a .diff file containing the local modifications.

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 909ce31aa6164df082a04709ee30250bcf71bdf2..02b99f9fb000a9090e2e34e2ce59f2008651fbed 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-11  Bruno Haible  <bruno@clisp.org>
+
+       * autopoint.in: When local files have been modified, create a .diff
+       file for the user's convenience.
+       Suggested by Denis Barbier <barbier@debian.org>.
+
 2003-08-07  Bruno Haible  <bruno@clisp.org>
 
        * autopoint.in: Fix the regular expression used to parse intl/VERSION.

diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 41bd208b4e3cc3f145809bfdf2c706ac1d21b8f4..ee9075c5e297fcea387ea2cc13abfe53bddf58d6 100644 (file)
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -375,6 +375,8 @@ func_destfile ()
 # original - too great risk of version mismatch.
 if test -z "$force"; then
   mismatch=
+  mismatchfile="${TMPDIR-/tmp}"/autopoint$$.diff
+  rm -f "$mismatchfile"
   for file in `find "$work_dir/archive" -type f -print | sed -e "s,^$work_dir/archive/,," | LC_ALL=C sort`; do
     func_destfile "$file"
     if test -n "$destfile"; then
@@ -382,15 +384,16 @@ if test -z "$force"; then
         if cmp -s "$work_dir/archive/$file" "$destfile"; then
           :
         else
-          echo "autopoint: File $destfile has been locally modified."
+          echo "autopoint: File $destfile has been locally modified." 1>&2
           mismatch=yes
+          diff -c "$work_dir/archive/$file" "$destfile" | sed -e "1s,$work_dir/archive/,," >> "$mismatchfile"
         fi
       fi
     fi
   done
   if test -n "$mismatch"; then
     rm -rf "$cvs_dir" "$work_dir"
-    func_fatal_error "Some files have been locally modified. Not overwriting them because --force has not been specified."
+    func_fatal_error "Some files have been locally modified. Not overwriting them because --force has not been specified. For your convenience, you find the local modifications in the file '$mismatchfile'."
   fi
 fi