X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/187702557df8864ab02b8c30820a893497b33ad7..4d5501dc8759aa3d8fedb7664b8e54e65b07ce41:/doc/bugs/Monotone_rcs_support.mdwn?ds=sidebyside diff --git a/doc/bugs/Monotone_rcs_support.mdwn b/doc/bugs/Monotone_rcs_support.mdwn index fcf3b0d10..11f93f11b 100644 --- a/doc/bugs/Monotone_rcs_support.mdwn +++ b/doc/bugs/Monotone_rcs_support.mdwn @@ -1,10 +1,43 @@ #Ikiwiki plugin for the Monotone revision control system. -I've just made a patch to the ikiwiki code that allows it to use the [Monotone](http://monotone.ca/) revision control system. It is available at: +I've just made a patch to the ikiwiki code that allows it to use the [[rcs/Monotone]] revision control system. It is available at: -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. +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 a rather recent Monotone perl module (18 August 2007 or later). 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]] + +>> I've committed a bunch of this to monotone so that in future it could be removed. +>> I've also just fixed this so it is in a separate, automagically generated, rc file. + +>>> Fair enough. Didn't realize you were a monotone committer. :-) + +>>>> I am, but still a little newish. Feedback is good. + +> 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? + +>> It should never reach that case, so I have changed that to error. + +> There'an incomplete comment ending with "note, this relies on the fact that" + +>> erg... sorry, fixed. + +[[tag patch]] + +>> I've [[accepted|done]] this patch, thank you! +>> +>> I did make a few changes. Please review, and make sure it still works +>> (a test case like we have for some of the other RCSes would be nice..) +>> +>> BTW, will all the monotone output parsing work if LANG != C? +>> +>> Do monotone post-commit hooks actually use REV? +>> --[[Joey]]