web commit by http://madduck.myopenid.com/: added git pitfalls link

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

diff --git a/doc/rcs/monotone.mdwn b/doc/rcs/monotone.mdwn
index 7c5497611db7c3ec3f9337f3c1bdcf97e8d9f7c8..d7938157109ccd3eb93ed35da55ca29506ba2908 100644 (file)
--- a/doc/rcs/monotone.mdwn
+++ b/doc/rcs/monotone.mdwn
@@ -8,9 +8,9 @@ The module is available from the monotone source repository at:
 <http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone>
 
 Monotone support works, but there are still a few minor missing bits (listed here so they are not forgotten):
 <http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone>
 
 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.
- * If you have both a conflict and a simultaneous rename on a file, then Ikiwiki may get confused.
+
+* 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.

 
 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.