X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f92505d78b82c6ac146e43054ebd12441575a602..575af4266797ed0be671630b62c5324d79c863ff:/doc/rcs/monotone.mdwn?ds=sidebyside diff --git a/doc/rcs/monotone.mdwn b/doc/rcs/monotone.mdwn index f9f474291..2e9939bf5 100644 --- a/doc/rcs/monotone.mdwn +++ b/doc/rcs/monotone.mdwn @@ -1,7 +1,7 @@ [Monotone](http://monotone.ca/) is a distributed revision control system. Ikiwiki supports storing a wiki in a Monotone repository and editing it using the [[cgi]] interface. It will use the Monotone logs to generate the -[[RecentChanges]] page. +[[Json.tl.ph]] page. The monotone support in ikiwiki requires the Monotone perl module to be installed. (It's available from the contrib/ directory in the monotone @@ -11,10 +11,14 @@ 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): -* The [[post-commit]] hook support is not yet completly implemented. * 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. + +Also note that not all recent ikiwiki features have been implemented in the +monotone plugin. At the moment we're missing: + + * [[todo/Untrusted_push_in_Monotone]]