From 7d583f0f4b36d4b2e39f56635e3e0057ad41eec9 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 4 Sep 2010 20:29:56 +0200
Subject: [PATCH] gnulib-tool: Help migration from --import to --add-import or
 --update.

* gnulib-tool: Emit a verbose error message when --import is used
without any module name.
---
 ChangeLog   |  6 ++++++
 gnulib-tool | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 23e391e16..9bece96c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-09-04  Bruno Haible  <bruno@clisp.org>
 
+	gnulib-tool: Help migration from --import to --add-import or --update.
+	* gnulib-tool: Emit a verbose error message when --import is used
+	without any module name.
+
+2010-09-04  Bruno Haible  <bruno@clisp.org>
+
 	Update doc about gnulib-tool.
 	* doc/gnulib-tool.texi (VCS Issues): Explain 'gnulib-tool --import' vs.
 	'gnulib-tool --update' in more detail.
diff --git a/gnulib-tool b/gnulib-tool
index a0a0112cf..78828e59d 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1235,6 +1235,19 @@ fi
       func_exit 1
     fi
   fi
+  # This code helps migrating from --import to --add-import or --update. It can
+  # be removed on 2012-01-01.
+  if test "$mode" = import && test $# = 0; then
+    echo "gnulib-tool: cowardly refusing to erase the module list." 1>&2
+    echo "The meaning of the option '--import' has changed." 1>&2
+    echo "See the documentation at" 1>&2
+    echo "<http://www.gnu.org/software/gnulib/manual/html_node/Modified-imports.html>." 1>&2
+    echo "For updating to a newer version of gnulib, use" 1>&2
+    echo "  gnulib-tool --add-import" 1>&2
+    echo "For restoring files that were omitted from version control, use" 1>&2
+    echo "  gnulib-tool --update" 1>&2
+    func_exit 1
+  fi
   if test "$mode" = update; then
     if test $# != 0; then
       echo "gnulib-tool: too many arguments in 'update' mode" 1>&2
-- 
2.11.0