(no commit message)

[git.ikiwiki.info.git] / doc / rcs / details.mdwn

diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn
index 6b9ffb91ff10b21e7b9d05079ba9f4fb6ddd5cb9..9bf65762f4e6fe62d5138bf00393d9f1bb90cb8e 100644 (file)
--- a/doc/rcs/details.mdwn
+++ b/doc/rcs/details.mdwn
@@ -1,6 +1,6 @@
 A few bits about the RCS backends
 
-[[toc ]]
+[[!toc ]]
 
 ## Terminology
 
@@ -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]]