aboutsummaryrefslogtreecommitdiff
path: root/doc/rcs/monotone.mdwn
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-08-22 01:58:53 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-08-22 01:58:53 +0000
commitb78b8b81202a1fdb0c56dea01e88acdd9171c504 (patch)
treebeecd71d88f9cf61e1f0dd8a8875b74cbfc85fe4 /doc/rcs/monotone.mdwn
parent3551b8322e769db35cb2b73b74a6bc617192866f (diff)
downloadikiwiki-b78b8b81202a1fdb0c56dea01e88acdd9171c504.tar
ikiwiki-b78b8b81202a1fdb0c56dea01e88acdd9171c504.tar.gz
web commit by http://willu.myopenid.com/: I should have previewed the previous commit - fixed list formatting
Diffstat (limited to 'doc/rcs/monotone.mdwn')
-rw-r--r--doc/rcs/monotone.mdwn9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/rcs/monotone.mdwn b/doc/rcs/monotone.mdwn
index 7c5497611..4711b6f4d 100644
--- a/doc/rcs/monotone.mdwn
+++ b/doc/rcs/monotone.mdwn
@@ -8,9 +8,10 @@ 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):
- * 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.
+* 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.