From: joey Date: Mon, 6 Aug 2007 13:23:48 +0000 (+0000) Subject: web commit by http://willu.myopenid.com/: Notes on updated diff X-Git-Tag: 2.6~229 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea7374183355f9c2712586831510862532db5311;p=ikiwiki.git web commit by willu.myopenid.com/: Notes on updated diff --- diff --git a/doc/bugs/Monotone_rcs_support.mdwn b/doc/bugs/Monotone_rcs_support.mdwn index cca582fa8..6e4ab8c76 100644 --- a/doc/bugs/Monotone_rcs_support.mdwn +++ b/doc/bugs/Monotone_rcs_support.mdwn @@ -4,13 +4,14 @@ I've just made a patch to the ikiwiki code that allows it to use the [Monotone]( -At the moment it supports basic committing and listing recent changes. It does not support rcs_notify() or rcs_getctime() yet. Moreover, -while there is support for simultaneous commits (e.g. conflicts), it is untested and if it happens to work would leave the repository in an unmerged state. +At the moment it supports basic committing and listing recent changes. It implements rcs_notify() and rcs_getctime(), but they're untested. Moreover, +while there is support for simultaneous commits, any conflicts leave the repository in an unmerged state which has to be cleaned up using the non-web +monotone interface. The user's data is still stored, and the user is informed if this happens. -But it is better than nothing. - -> For sure. The conflict issue seems like the main problem. I might just add it to ikiwiki and mark is as experimental and known buggy though. :-) --[[Joey]] +> The conflict issue seems like the main problem. I might just add it to ikiwiki and mark is as experimental and known buggy though. :-) --[[Joey]] Note: This patch requires the Monotone perl module, which is only available in Monotone 0.36 or later. The module is in the Monotone contrib/ directory. While 0.36 is relatively new, that Monotone module itself will work with a monotone binary back quite a few releases. +Apparently this module did't make some versions of the monotone 0.36 release tarball. It is available from the monotone repository here: . + [[tag patch]]