Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / multiple_simultaneous_rcs / discussion.mdwn

diff --git a/doc/todo/multiple_simultaneous_rcs/discussion.mdwn b/doc/todo/multiple_simultaneous_rcs/discussion.mdwn
index 32870632f933f7fdf6ceedc4a5ea4f4750946526..a655c9fd1ec66511ce3eff4998f2e962bb680d95 100644 (file)
--- a/doc/todo/multiple_simultaneous_rcs/discussion.mdwn
+++ b/doc/todo/multiple_simultaneous_rcs/discussion.mdwn
@@ -4,4 +4,12 @@ This would probably be the ideal backend for 'multi repo' I suppose.
 
 ~[[harningt]] 2007-11-06
 
-----
\ No newline at end of file
+> mr's interface to revision control systems is much shallower than
+> ikiwiki's. mr only needs to know how to run a "pull" or a "commit"
+> command, it doesn't matter if these commands behave very differently
+> for different systems. Ikiwiki needs to be able to commit a change,
+> handling conflicts, in a way tuned to the revision control system being
+> used, amoung other things. So mr isn't a very good fit for use by ikiwiki.
+> --[[Joey]]
+
+----