summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-07-05 14:04:54 -0400
committerJoey Hess <joey@kitenet.net>2010-07-05 14:04:54 -0400
commit819e2a567aa8e528b95cc6e146d5ee92fd486cc8 (patch)
tree64b8236b4a80b7fd9cd4a8ae559868725a483ade /doc
parentf6db10df21f04df83e109924647b07672050dbf3 (diff)
parentcddb39cbf5d385273645f62f15bdf29b7607aac2 (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc')
-rw-r--r--doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn33
-rw-r--r--doc/sandbox.mdwn11
2 files changed, 34 insertions, 10 deletions
diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
new file mode 100644
index 000000000..69af04fe9
--- /dev/null
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -0,0 +1,33 @@
+Hello Joey,
+
+I noticed that my Ikiwiki started to rebuild pages very slowly after my last changes
+when I upgraded Ikiwiki to version 3.20100623. Now I have the latest release 3.20100704,
+but it doesn't help me.
+
+I started to debug the problem and I found that I can see a lot of messages
+like below when I try to rebuild my wiki manually:
+
+ svn: '/path/to/ikiwiki/trunk/pages/ostatnie_zmiany' is not a working copy
+ svn: Can't open file '/path/to/ikiwiki/trunk/pages/ostatnie_zmiany/.svn/entries': No such file or directory
+ svn log exited 256
+
+"ostatnie_zmiany" is a value of `recentchangespage` parameter in my
+`ikiwiki.setup` file. It is not under control Subversion I use for Ikiwiki:
+
+ $ svn status pages/ostatnie_zmiany
+ ? pages/ostatnie_zmiany
+
+ $ ls pages/ostatnie_zmiany/*._change |wc -l
+ 100
+
+`recentchangesnum` parameter has value 100 for me and I noticed that my Ikiwiki
+takes a lot of time to parse all `._change` files. Finally it doesn't refresh
+/ostatnie_zmiany.html page.
+
+Do you think I should add `ostatnie_zmiany` directory under control of my
+Subversion repo? If it's not necessary, could you please give me any hint
+to find a reason of problem with my Ikiwiki?
+
+My best regards,
+Pawel
+
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..f386adec4 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,15 +1,5 @@
This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]).
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
-
-# Header
-
-## Subheader2
-
> This is a blockquote.
>
> This is the first level of quoting.
@@ -29,6 +19,7 @@ Numbered list
1. And another..
1. foo
2. bar
+ 3. quz
Bulleted list