X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/187702557df8864ab02b8c30820a893497b33ad7..6bcfbbf81a49b0aa3850846141f3dda64c66bcf1:/doc/bugs/Monotone_rcs_support.mdwn?ds=inline diff --git a/doc/bugs/Monotone_rcs_support.mdwn b/doc/bugs/Monotone_rcs_support.mdwn index fcf3b0d10..437fbafbc 100644 --- a/doc/bugs/Monotone_rcs_support.mdwn +++ b/doc/bugs/Monotone_rcs_support.mdwn @@ -4,7 +4,24 @@ 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 is basically complete. At present rcs_notify() is implemeted but untested, the rest is implemented and tested. -But it is better than nothing. +In an older version of the patch +there was support for simultaneous commits, but any conflicts left the repository in an unmerged state which had to be cleaned up using the non-web +monotone interface. The user's data was still stored, and the user was informed if that happened. + +The current version of the patch handles conflicts through the web interface. It is still not perfect as it will break if there is a rename that conflicts with a web change (but so will the other Rcs plugins I think). It also commits a revision with conflict markers if there is a conflict requiring such markers... ick. + +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: . + +> The setup instructions to add 40 lines of code to monotonerc is pretty frightning stuff. +> Is there some way this can be automated? --[[Joey]] + +> Having rcs_commit return a warning message when there's an unresolved conflict +> isn't right; that message will populate the page edit box. You might want +> to use the error() function here? + +> There'an incomplete comment ending with "note, this relies on the fact that" + +[[tag patch]]