* Add a missing -n to tla undo call.
parent
949c66c3eb
commit
757b627414
|
@ -61,7 +61,7 @@ sub rcs_commit ($$$) { #{{{
|
||||||
"-L".possibly_foolish_untaint($message),
|
"-L".possibly_foolish_untaint($message),
|
||||||
'-d', $config{srcdir}) != 0) {
|
'-d', $config{srcdir}) != 0) {
|
||||||
my $conflict=readfile("$config{srcdir}/$file");
|
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");
|
warn("tla undo failed\n");
|
||||||
}
|
}
|
||||||
return $conflict;
|
return $conflict;
|
||||||
|
|
|
@ -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
|
ikiwiki (1.25) unstable; urgency=low
|
||||||
|
|
||||||
* Add proper waitpid calls for open2ed processes throughout to avoid
|
* Add proper waitpid calls for open2ed processes throughout to avoid
|
||||||
|
|
Loading…
Reference in New Issue