X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3aab99fae5f7681154a35a3e75d8e225424e2d8b..dc0409b4a717da9926e618341cbd96ab1c4cb763:/doc/todo/mercurial.mdwn

diff --git a/doc/todo/mercurial.mdwn b/doc/todo/mercurial.mdwn
index c0af10719..9635b6880 100644
--- a/doc/todo/mercurial.mdwn
+++ b/doc/todo/mercurial.mdwn
@@ -31,19 +31,21 @@ This should update the working directory and run ikiwiki every time a change is
 
 The problem with --post-commit is that if you delete some pages in $SRC, ikiwiki --setup setupfile --post-commit will not delete them in $DEST.
 
-I add the following to .hg/hgrc:
+I add the following to .hg/hgrc:(I use changegroup since I don't think we need refresh per changeset, please point out if I am wrong.)
 
-  [hooks]
-  changegroup = hg update >&2 && ikiwiki --setup path.to.setup.file --refresh
-  post-commit = ikiwiki --setup path.to.setup.file --refresh
+    [hooks]
+    changegroup = hg update >&2 && ikiwiki --setup path.to.setup.file --refresh
+    post-commit = ikiwiki --setup path.to.setup.file --refresh
 
 I tried the follwing commands in $SRC:
 
-  touch deadlocktest.mdwn
-  hg add
-  hg ci
+    touch deadlocktest.mdwn
+    hg add
+    hg ci
+
+No deadlock happens.  (Also I push to the $SRC from another machine, again, no deadlock.  If there is conflicts between $SRC and my own repo, hg pull will abort.  You have to pull, merge and push again.)
+
 
-No deadlock happens.  (Also I push to the $SRC from another machine, again, no deadlock.)  
 
 Of course these tests are too simple.  The problem is I have no idea when the deadlock will happen. If someone is kind enough to point out, I will run more test.