rm

[git.ikiwiki.info.git] / doc / rcs / monotone.mdwn

diff --git a/doc/rcs/monotone.mdwn b/doc/rcs/monotone.mdwn
index 4711b6f4d2202854aa3fd634a560caab3fb492ce..1d3cd2bc4160c4818febf319d45a2be6c3b7d52b 100644 (file)
--- a/doc/rcs/monotone.mdwn
+++ b/doc/rcs/monotone.mdwn
@@ -10,8 +10,6 @@ The module is available from the monotone source repository at:
 Monotone support works, but there are still a few minor missing bits (listed here so they are not forgotten):
 
 * At the moment there are no links to display diffs between revisions.  It shouldn't be hard to add links to a [ViewMTN](http://grahame.angrygoats.net/moinmoin/ViewMTN) instance, but it hasn't been done yet.
 Monotone support works, but there are still a few minor missing bits (listed here so they are not forgotten):
 
 * At the moment there are no links to display diffs between revisions.  It shouldn't be hard to add links to a [ViewMTN](http://grahame.angrygoats.net/moinmoin/ViewMTN) instance, but it hasn't been done yet.

-* The [[post-commit]] hook support, so that Ikiwiki sends change notifications when people commit using Monotone rather than the web interface, is partially implemented and untested.

 * Documentation (this page) could be improved.
 * Documentation (this page) could be improved.

-* If you have both a conflict and a simultaneous rename on a file, then Ikiwiki may get confused.

 
 There is also a mismatch between the way Ikiwiki handles conflicts and the way Monotone handles conflicts.  At present, if there is a conflict, then Ikiwiki will commit a revision with conflict markers before presenting it to the user.  This is ugly, but there is no clean way to fix it at present.
 
 There is also a mismatch between the way Ikiwiki handles conflicts and the way Monotone handles conflicts.  At present, if there is a conflict, then Ikiwiki will commit a revision with conflict markers before presenting it to the user.  This is ugly, but there is no clean way to fix it at present.