diff options
author | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
commit | 4558457402a4ab6bc795589a2e400fa66144f76e (patch) | |
tree | 8368320617a8febc3c9c9708f688b6591801f4c0 /doc/rcs/mercurial.mdwn | |
parent | 9db2438b3a0366738ba2e1b6e23ad3d8ae2fe36e (diff) | |
parent | 2cc3f5d057c5882e08d16746985c49a7dd1a4c01 (diff) |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Diffstat (limited to 'doc/rcs/mercurial.mdwn')
-rw-r--r-- | doc/rcs/mercurial.mdwn | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/rcs/mercurial.mdwn b/doc/rcs/mercurial.mdwn index b4baf07f4..ebfc35202 100644 --- a/doc/rcs/mercurial.mdwn +++ b/doc/rcs/mercurial.mdwn @@ -10,9 +10,9 @@ commits edited pages, and uses the Mercurial history to generate the Example for a `.hg/hgrc` file in `$SRCDIR`: [hooks] - post-commit = /home/abe/bin/rebuildwiki - incoming = /home/abe/bin/rebuildwiki + post-commit = ikiwiki --setup /path/to/ikiwiki.setup --post-commit + incoming = ikiwiki --setup /path/to/ikiwiki.setup --post-commit -Do not use `commit` or `precommit` hooks or ikiwiki will run into a dead lock when committing in `$SRCDIR` +Do not use `commit` or `precommit` hooks or ikiwiki will run into a dead lock when committing in `$SRCDIR`. Also note that `--post-commit` and not `--refresh` must be used to avoid dead locking when editing the pages via CGI interface. See also [[todo/mercurial|todo/mercurial]] |