web commit by ali: Don't wrap my error message!

[git.ikiwiki.info.git] / doc / bugs / Monotone_rcs_support.mdwn

diff --git a/doc/bugs/Monotone_rcs_support.mdwn b/doc/bugs/Monotone_rcs_support.mdwn
index 0237c00374ab50c7763037890801aac2aef13acc..11f93f11bbb74627bd18ec0f68c04b958dcc460f 100644 (file)
--- a/doc/bugs/Monotone_rcs_support.mdwn
+++ b/doc/bugs/Monotone_rcs_support.mdwn
@@ -1,20 +1,43 @@
 #Ikiwiki plugin for the Monotone revision control system.
 
 #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:

 
 <http://www.cse.unsw.edu.au/~willu/monotone-ikiwiki.diff>
 
 
 <http://www.cse.unsw.edu.au/~willu/monotone-ikiwiki.diff>
 

-At the moment it is basically complete.  It implements rcs_notify() and rcs_getctime(), but they're untested.
+At the moment it is basically complete.  At present rcs_notify() is implemeted but untested, the rest is implemented and tested.

 
 

-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.

 
 

-> 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 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>.

 
 

-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.
+> 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.

 
 

-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: <http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone>.
+> 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]]
 
 [[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]]