X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/9dd52850252fc3ad5961277db586cb29eb5d42bd..aa92d75b4a2e8f6fd6dc38e3fb898f4667cd6f70:/doc/rcs/details.mdwn diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn index 6b9ffb91f..a6174f439 100644 --- a/doc/rcs/details.mdwn +++ b/doc/rcs/details.mdwn @@ -117,6 +117,14 @@ towards transmitting changes with standalone patch bundles (often by email) as d >> plugin in [[todo/darcs]], if you submit one that's complete, I will >> probably accept it into ikiwiki.. --[[Joey]] +>>> I'd like to help make a robust darcs (2) backend. I also think ikiwiki should use +>>> exactly one darcs repo. I think we can simplify and say conflicting web +>>> edits are not allowed, like most current wiki engines. I don't see that +>>> saving (so much) context in the html is necessary, then. +>>> bma, I would like to see your code. --[[Simon_Michael]] +>>> PS ah, there it is. Let's continue on the [[todo/darcs]] page. + + ## [[Git]] Regarding the Git support, Recai says: @@ -352,3 +360,5 @@ merge again with a merger that inserts conflict markers. It commits this new revision with conflict markers to the repository. It then returns the text to the user for cleanup. This is less neat than it could be, in that a conflict marked revision gets committed to the repository. + +## [[bzr]]