From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 8 Sep 2006 19:19:56 +0000 (+0000)
Subject: * Add a missing -n to tla undo call.
X-Git-Tag: 1.26~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/757b627414003278089d50fd6bf3cdda9d77b6d5?ds=sidebyside

* Add a missing -n to tla undo call.
---

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 48dc78157..7ce635c64 100644
--- 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 ca0d21e16..0e3b0fd47 100644
--- 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