forgot to add this

[git.ikiwiki.info.git] / doc / about_rcs_backends.mdwn

diff --git a/doc/about_rcs_backends.mdwn b/doc/about_rcs_backends.mdwn
index ea7a9ac892d4ed154f87fbe3eaee5c1cdfb3da61..85468bc7c802a734257c62fa738373216bff600f 100644 (file)
--- a/doc/about_rcs_backends.mdwn
+++ b/doc/about_rcs_backends.mdwn
@@ -1,16 +1,16 @@
-## A few bits about the RCS backends
+# A few bits about the RCS backends

 
 

-### Terminology
+## Terminology

 
 ``web-edit'' means that a page is edited by using the web (CGI) interface
 as opposed to using a editor and the RCS interface.
 
 
 
 ``web-edit'' means that a page is edited by using the web (CGI) interface
 as opposed to using a editor and the RCS interface.
 
 

-### [[Subversion]]
+## [[Subversion]]

 
 Subversion was the first RCS to be supported by ikiwiki.
 
 
 Subversion was the first RCS to be supported by ikiwiki.
 

-#### How does it work internally?
+### How does it work internally?

 
 Master repository M.
 
 
 Master repository M.
 


@@ -28,12 +28,12 @@ see [[commit-internals]].
 You browse and web-edit the wiki on W.
 
 
 You browse and web-edit the wiki on W.
 
 

-### [darcs](http://darcs.net/) (not yet included)
+## [darcs](http://darcs.net/) (not yet included)

 
 Support for using darcs as a backend is being worked on by [Thomas
 Schwinge](mailto:tschwinge@gnu.org).
 
 
 Support for using darcs as a backend is being worked on by [Thomas
 Schwinge](mailto:tschwinge@gnu.org).
 

-#### How will it work internally?
+### How will it work internally?

 
 ``Master'' repository R1.
 
 
 ``Master'' repository R1.
 


@@ -59,7 +59,7 @@ 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

 
 darcs is a distributed RCS, which means that every checkout of a
 repository is equal to the repository it was checked-out from.  There is
 
 darcs is a distributed RCS, which means that every checkout of a
 repository is equal to the repository it was checked-out from.  There is


@@ -74,3 +74,25 @@ doesn't really differ from the other checkouts that people will branch
 off from R1.
 
 (To be continued.)
 off from R1.
 
 (To be continued.)

+
+
+## [[Git]]
+
+Regarding the Git support, Recai says:
+
+I have been testing it for the past few days and it seems satisfactory.  I
+haven't observed any race condition regarding the concurrent blog commits
+and it handles merge conflicts gracefully as far as I can see.
+
+As you may notice from the patch size, GIT support is not so trivial to
+implement (for me, at least).  Being a fairly fresh code base it has some
+bugs.  It also has some drawbacks (especially wrt merge which was the hard
+part).  GIT doesn't have a similar functionality like 'svn merge -rOLD:NEW
+FILE' (please see the relevant comment in mergepast for more details), so I
+had to invent an ugly hack just for the purpose.
+
+## [mercurial](http://www.selenic.com/mercurial/)
+
+Being worked on by Emanuele Aina.
+
+<http://techn.ocracy.org/ikiwiki>