X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e050f35261fe453b70294b58bc6c87bfe57cf231..e163b037bf3c9fa68be0971752e6d6584f8d55fd:/doc/rcs/details.mdwn?ds=inline diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn index 449e129bd..e62f3ef49 100644 --- 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: @@ -258,8 +266,7 @@ on the same local machine, I suggest to create the latter with the "`git clone - command to save disk space. Note that, as a rule of thumb, you should always put the rcs wrapper (`post-update`) -into the master repository (`.git/hooks/`) as can be noticed in the Git wrappers of -the sample [[ikiwiki.setup]]. +into the master repository (`.git/hooks/`). Here is how a web edit works with ikiwiki and git: