diff options
| -rw-r--r-- | IkiWiki/Rcs/tla.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 1 deletions
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 |