# 
# patch "ChangeLog"
#  from [a77d2c49bd2d7868acdd6ad6c459f7b244863f9f]
#    to [a3d59021b8c6a2c54967567427d87bbdcaa3b3ce]
# 
# patch "commands.cc"
#  from [e5a84234e119daa9545a1714e10ce70f4536f24c]
#    to [f040377ef1f5956aed939b8edbabaf646d5b0689]
# 
# patch "tests/t_diff_external.at"
#  from [e4c70aa4c4144040ea0b027948f6a8dc98a55ae9]
#    to [f44d899d4e359fce55e22de6bd4c3752d1d18770]
# 
========================================================================
--- ChangeLog	a77d2c49bd2d7868acdd6ad6c459f7b244863f9f
+++ ChangeLog	a3d59021b8c6a2c54967567427d87bbdcaa3b3ce
@@ -1,3 +1,9 @@
+2005-08-23  Nathaniel Smith  <address@hidden>
+
+	* tests/t_diff_external.at: --diff-args without --external is an
+	error.
+	* commands.cc (diff): Likewise.
+
 2005-08-22  Nathaniel Smith  <address@hidden>
 
 	* contrib/ciabot_monotone.py (send_change_for): Handle author
========================================================================
--- commands.cc	e5a84234e119daa9545a1714e10ce70f4536f24c
+++ commands.cc	f040377ef1f5956aed939b8edbabaf646d5b0689
@@ -2591,6 +2591,11 @@
   diff_type type = app.diff_format;
   ostringstream header;
 
+  if (app.diff_args_provided)
+    N(app.diff_format == external_diff,
+      F("--diff-args requires --external\n"
+        "try adding --external or removing --diff-args?"));
+
   change_set composite;
 
   // initialize before transaction so we have a database to work with
========================================================================
--- tests/t_diff_external.at	e4c70aa4c4144040ea0b027948f6a8dc98a55ae9
+++ tests/t_diff_external.at	f44d899d4e359fce55e22de6bd4c3752d1d18770
@@ -62,4 +62,7 @@
 AT_CHECK(QGREP("rev_old: $OLD_SHA" stdout))
 AT_CHECK(QGREP("rev_new: $NEW_SHA" stdout))
 
+# Make sure that --diff-args without --external is an error
+AT_CHECK(MONOTONE diff --diff-args="foo", [1], [ignore], [ignore])
+
 AT_CLEANUP