urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add a missing -n to tla undo call.

master
joey 2006-09-08 19:19:56 +00:00
parent 949c66c3eb
commit 757b627414
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Rcs/tla.pm
View File

@ -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;

6
debian/changelog vendored
View File

@ -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