From c2c943bc25a83b5c4c3eab3b43a7b6e4c4f4ba33 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Tue, 21 Aug 2007 16:55:13 +0000
Subject: monotone updates

---
 IkiWiki/Rcs/monotone.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
index be6b36c66..992065931 100644
--- a/IkiWiki/Rcs/monotone.pm
+++ b/IkiWiki/Rcs/monotone.pm
@@ -245,6 +245,9 @@ sub rcs_commit ($$$;$$) { #{{{
 		# FIXME: use of $file in these backticks is not wise from a
 		# security POV. Probably safe, but should be avoided
 		# anyway.
+		# At the moment the backticks are used because the above call using the automate
+		# interface was failing.  When that bug in monotone is fixed, we should switch
+		# back.
 		my $diff = `mtn --root=$config{mtnrootdir} au content_diff -r $oldrev -r $rev $file`; # was just $out;
 
 		if ($diff) {
@@ -314,8 +317,6 @@ sub rcs_commit ($$$;$$) { #{{{
 						"Please use the non-web interface to resolve the conflicts.");
 				}
 				
-				# suspend this revision because it has
-				# conflict markers...
 				if (system("mtn", "--root=$config{mtnrootdir}",
 				           "update", "-r", $mergeResult) != 0) {
 					debug("Unable to update to rev $mergeResult after conflict-enhanced merge on conflicted commit!");
@@ -363,7 +364,7 @@ sub rcs_add ($) { #{{{
 	check_config();
 
 	if (system("mtn", "--root=$config{mtnrootdir}", "add", "--quiet",
-	           "$config{srcdir}/$file") != 0) {
+	           $file) != 0) {
 		error("Monotone add failed");
 	}
 } #}}}
-- 
cgit v1.2.3