* Add a missing -n to tla undo call.

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 48dc78157ae95b5406a6fdf61b04bb236c1f4a91..7ce635c64028f95ddae34bdc23214fd9aced1a2b 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -61,7 +61,7 @@ sub rcs_commit ($$$) { #{{{
                           "-L".possibly_foolish_untaint($message),
                           '-d', $config{srcdir}) != 0) {
                        my $conflict=readfile("$config{srcdir}/$file");
-                       if (system("tla", "undo", "--quiet", "-d", "$config{srcdir}") != 0) {
+                       if (system("tla", "undo", "-n", "--quiet", "-d", "$config{srcdir}") != 0) {
                                warn("tla undo failed\n");
                        }
                        return $conflict;

diff --git a/debian/changelog b/debian/changelog
index ca0d21e163979849db2713ddbd22b0486b5d198d..0e3b0fd475326296565e8205ce4dd4dacc6a9d68 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (1.26) UNRELEASED; urgency=low
+
+  * Add a missing -n to tla undo call. 
+
+ -- Joey Hess <joeyh@debian.org>  Fri,  8 Sep 2006 15:10:13 -0400
+
 ikiwiki (1.25) unstable; urgency=low
 
   * Add proper waitpid calls for open2ed processes throughout to avoid