update for rename of users/jondowland.mdwn to users/jon.mdwn

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

diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn
index b20abd38918bb9ead54f57806849911831925923..089221caba26027cb013ea69fd4650cb0ae8c44b 100644 (file)
--- a/doc/rcs/details.mdwn
+++ b/doc/rcs/details.mdwn
@@ -1,6 +1,6 @@
 A few bits about the RCS backends
 
 A few bits about the RCS backends
 

-[[toc ]]
+[[!toc ]]

 
 ## Terminology
 
 
 ## Terminology
 


@@ -62,7 +62,7 @@ rcs\_commit().  Is rcs\_prepedit() suitable?
 It follows that the HTML rendering and the CGI handling can be completely
 separated parts in ikiwiki.
 
 It follows that the HTML rendering and the CGI handling can be completely
 separated parts in ikiwiki.
 

-What repository should [[RecentChanges]] and [[History]] work on?  R1?
+What repository should [[RecentChanges]] and History work on?  R1?

 
 #### Rationale for doing it differently than in the Subversion case
 
 
 #### Rationale for doing it differently than in the Subversion case
 


@@ -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]]
 
 >> 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:
 ## [[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`)
 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:
 
 
 Here is how a web edit works with ikiwiki and git:
 


@@ -273,6 +280,9 @@ Here is a how a commit from a remote repository works:
 
 * git-commit in the remote repository
 * git-push, pushes the commit to the master repo on the server
 
 * git-commit in the remote repository
 * git-push, pushes the commit to the master repo on the server

+* (Optionally, the master repo's pre-receive hook runs, and checks that the
+  update only modifies files that the pushing user is allowed to update. 
+  If not, it aborts the receive.)

 * the master repo's post-update hook notices this update, and runs ikiwiki
 * ikiwiki notices the modifies page source, and compiles it
 
 * the master repo's post-update hook notices this update, and runs ikiwiki
 * ikiwiki notices the modifies page source, and compiles it
 


@@ -352,3 +362,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.
 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]]