summaryrefslogtreecommitdiff
path: root/doc/rcs
diff options
context:
space:
mode:
authorSimon McVittie <smcv@carbon.pseudorandom.co.uk>2008-07-14 22:22:39 +0100
committerSimon McVittie <smcv@carbon.pseudorandom.co.uk>2008-07-14 22:22:39 +0100
commita65d312467c5ab179ecf4aa715790f371a46634a (patch)
tree7565862f3e2f86a1e9ff623d991f3150860230a4 /doc/rcs
parent31bc223abbe0ec1990921b4bab85f074431b0c1d (diff)
parent66053f6fc7b300c9b49a5c69d2c7a1eeec841743 (diff)
Merge branch 'master' of git://git.ikiwiki.info
Diffstat (limited to 'doc/rcs')
-rw-r--r--doc/rcs/mercurial.mdwn12
1 files changed, 11 insertions, 1 deletions
diff --git a/doc/rcs/mercurial.mdwn b/doc/rcs/mercurial.mdwn
index 5eaae1997..b4baf07f4 100644
--- a/doc/rcs/mercurial.mdwn
+++ b/doc/rcs/mercurial.mdwn
@@ -2,7 +2,17 @@
system developed by Matt Mackall. Ikiwiki supports storing a wiki in a
mercurial repository.
-Ikiwiki can run as a post-update hook to update a wiki whenever commits
+Ikiwiki can run as a `post-commit` and/or `incoming` hook to update a wiki whenever commits or remote pushes
come in. When running as a [[cgi]] with Mercurial, ikiwiki automatically
commits edited pages, and uses the Mercurial history to generate the
[[RecentChanges]] page.
+
+Example for a `.hg/hgrc` file in `$SRCDIR`:
+
+ [hooks]
+ post-commit = /home/abe/bin/rebuildwiki
+ incoming = /home/abe/bin/rebuildwiki
+
+Do not use `commit` or `precommit` hooks or ikiwiki will run into a dead lock when committing in `$SRCDIR`
+
+See also [[todo/mercurial|todo/mercurial]]