master
joey 2007-01-14 04:51:35 +00:00
parent 49d63e7a55
commit d69488a9df
1 changed files with 1 additions and 1 deletions

View File

@ -95,7 +95,7 @@ sub rcs_commit ($$$;$$) { #{{{
if (system("svn", "commit", "--quiet",
"--encoding", "UTF-8", "-m",
possibly_foolish_untaint($message),
"$config{srcdir}") != 0) {
$config{srcdir}) != 0) {
my $conflict=readfile("$config{srcdir}/$file");
if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {
warn("svn revert failed\n");