2007-08-03 08:06:21 +02:00
#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:
<http://www.cse.unsw.edu.au/~willu/monotone-ikiwiki.diff>
2007-08-11 09:18:42 +02:00
At the moment it is basically complete. At present rcs_notify() is implemeted but untested, the rest is implemented and tested.
2007-08-07 16:25:36 +02:00
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.
2007-08-03 19:31:14 +02:00
2007-08-18 05:16:28 +02:00
Note: This patch requires a rather recent Monotone perl module (18 August 2007 or later). It is available from the monotone repository here: <http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone>.
2007-08-06 15:23:48 +02:00
2007-08-12 00:12:48 +02:00
> The setup instructions to add 40 lines of code to monotonerc is pretty frightning stuff.
> Is there some way this can be automated? --[[Joey]]
2007-08-18 05:16:28 +02:00
>> 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.
2007-08-12 09:21:07 +02:00
2007-08-18 05:16:28 +02:00
>>> Fair enough. Didn't realize you were a monotone committer. :-)
2007-08-12 09:05:31 +02:00
2007-08-18 05:16:28 +02:00
>>>> I am, but still a little newish. Feedback is good.
2007-08-12 09:21:07 +02:00
2007-08-12 00:12:48 +02:00
> 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?
2007-08-18 05:16:28 +02:00
>> It should never reach that case, so I have changed that to error.
2007-08-12 09:05:31 +02:00
2007-08-12 00:12:48 +02:00
> There'an incomplete comment ending with "note, this relies on the fact that"
2007-08-18 05:16:28 +02:00
>> erg... sorry, fixed.
2007-08-12 09:05:31 +02:00
2007-08-03 19:31:14 +02:00
[[tag patch]]