Merge branch 'master' into fancypodcast

[git.ikiwiki.info.git] / doc / bugs / post-commit_hangs.mdwn

diff --git a/doc/bugs/post-commit_hangs.mdwn b/doc/bugs/post-commit_hangs.mdwn
index 1e16bc0971bfb27bc451c33ce08f702e8cef71fc..32820d8864476ed5dbcf4d62515577f5faad5c54 100644 (file)
--- a/doc/bugs/post-commit_hangs.mdwn
+++ b/doc/bugs/post-commit_hangs.mdwn
@@ -24,6 +24,23 @@ I installed ikiwiki v3.14159 in /usr/local from tarball (/usr contains an older
 >>>> I'm trying to run ikiwiki --setup from the command line after modifying the setup file.
 >>>> ikiwiki --setup is calling hg update, which is calling ikiwiki --post-commit. Am I not supposed to do that? --Ali
 
 >>>> I'm trying to run ikiwiki --setup from the command line after modifying the setup file.
 >>>> ikiwiki --setup is calling hg update, which is calling ikiwiki --post-commit. Am I not supposed to do that? --Ali
 

+>>>>> No, I don't think that hg update should call ikiwiki anything. The
+>>>>> [[hgrc_example|rcs/mercurial]] doesn't seem to configure it to do that? --[[Joey]] 
+
+>>>>>> Ok, I'm not sure I understand what's going on, but my problem is solved.
+>>>>>>
+>>>>>> My hgrc used to say:
+>>>>>>
+>>>>>> [hooks]
+>>>>>>
+>>>>>> incoming.update = hg up
+>>>>>>
+>>>>>> update.ikiwiki = ikiwiki --setup /home/ikiwiki/ikiwiki.setup --post-commit
+>>>>>>
+>>>>>> I've now changed it to match the example page and it works. Thanks --Ali.
+
+>>>>>>> [[done]]
+

 > Also, how have you arranged to keep it from seeing the installation in /usr? Perl could well be loading
 > modules from the old installation, and if it's one with a different locking strategy that would explain your problem. --[[Joey]] 
 
 > Also, how have you arranged to keep it from seeing the installation in /usr? Perl could well be loading
 > modules from the old installation, and if it's one with a different locking strategy that would explain your problem. --[[Joey]]