From a5923e39995165bd75d4048d646a226a88be920b Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Thu, 29 Apr 2010 00:27:03 +0000 Subject: [PATCH 1/7] reply --- doc/news/version_3.20100427/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/news/version_3.20100427/discussion.mdwn b/doc/news/version_3.20100427/discussion.mdwn index 726f9a0d2..011f3d88f 100644 --- a/doc/news/version_3.20100427/discussion.mdwn +++ b/doc/news/version_3.20100427/discussion.mdwn @@ -5,3 +5,5 @@ Would it be possible to make that a config option? Because I do use includes in > I don't like config options that make wikis unsafe, but I should have > revisted enabling includes for templates read from the templatedir -- > it's easy to do, and I've done it now. --[[Joey]] + +>> Thank you! --[[KathrynAndersen]] From 0c7d2cf9b2773bd17c0ec549ed1ba833ff1913e1 Mon Sep 17 00:00:00 2001 From: albertlash Date: Thu, 29 Apr 2010 03:44:27 +0000 Subject: [PATCH 2/7] --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index 683a3f8ac..31110f3c6 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -1,3 +1,11 @@ +20100428 - I just wrote a simple ruby script which will connect to a mysql server and then recreate the pages and their revision histories with Grit. It also does one simple conversion of equals titles to pounds. Enjoy! + +http://github.com/docunext/mediawiki2gitikiwiki + +-- [[users/Albert]] + +---- + The u32 page is excellent, but I wonder if documenting the procedure here would be worthwhile. Who knows, the remote site might disappear. But also there are some variations on the approach that might be useful: From ebde1ee2fd814e45e0e108bb1a9ba81499d86c87 Mon Sep 17 00:00:00 2001 From: albertlash Date: Thu, 29 Apr 2010 03:44:52 +0000 Subject: [PATCH 3/7] --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index 31110f3c6..592a06a5b 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -1,6 +1,6 @@ 20100428 - I just wrote a simple ruby script which will connect to a mysql server and then recreate the pages and their revision histories with Grit. It also does one simple conversion of equals titles to pounds. Enjoy! -http://github.com/docunext/mediawiki2gitikiwiki + -- [[users/Albert]] From 8d7dba2fb274b024e7a8b5d8ce4414d3e5bf7420 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 29 Apr 2010 15:35:59 +0000 Subject: [PATCH 4/7] wl rcs --- doc/rcs/svn.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/rcs/svn.mdwn b/doc/rcs/svn.mdwn index f8c44b6eb..7aa682978 100644 --- a/doc/rcs/svn.mdwn +++ b/doc/rcs/svn.mdwn @@ -1,4 +1,4 @@ -[Subversion](http://subversion.tigris.org/) is a revision control system. While ikiwiki is relatively +[Subversion](http://subversion.tigris.org/) is a [[revision control system|rcs]]. While ikiwiki is relatively independent of the underlying revision control system, and can easily be used without one, using it with Subversion or another revision control system is recommended. From d57d2ecca722cb7c43d2b14ed31f38c3e204079c Mon Sep 17 00:00:00 2001 From: simonraven Date: Thu, 29 Apr 2010 16:18:15 +0000 Subject: [PATCH 5/7] YA URI to another mediawiki to git project --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index 592a06a5b..8a2261543 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -657,3 +657,6 @@ page.--[[users/Chadius]] > on mediawiki in general. It seems to produce output that could be > used by the [[plugins/contrib/mediawiki]] plugin, if the filenames > were fixed to use the right extension. --[[Joey]] + +>> Here's another I found while browsing around starting from the link you gave Joey
+>> From f7f1dd3a3852ef158a577387faee2c34c4f9cfad Mon Sep 17 00:00:00 2001 From: simonraven Date: Thu, 29 Apr 2010 16:24:23 +0000 Subject: [PATCH 6/7] more to add on my comment --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index 8a2261543..d67a9131b 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -659,4 +659,7 @@ page.--[[users/Chadius]] > were fixed to use the right extension. --[[Joey]] >> Here's another I found while browsing around starting from the link you gave Joey
->> +>>
+>> As I don't run mediawiki anymore, but I still have my xz/gzip-compressed XML dumps, +>> it's certainly easier for me to do it this way; also a file or a set of files is easier to lug +>> around on some medium than a full mysqld or postgres master and relevant databases. From 9fb15ec9fec8903776be0be01eaed0e7bb7d5009 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Fri, 30 Apr 2010 16:48:19 +0100 Subject: [PATCH 7/7] new bug: svn commit failures... --- ...t_failures_interpreted_as_merge_conflicts.mdwn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn diff --git a/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn new file mode 100644 index 000000000..09753b4ee --- /dev/null +++ b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn @@ -0,0 +1,15 @@ +I'm attempting a merge with the SVN plugin via the web interface +with ikiwiki-3.20100403 and subversion 1.6.11. + +The web interface says + + Your changes conflict with other changes made to the page. + + Conflict markers have been inserted into the page content. Reconcile the conflict and commit again to save your changes. + +However there are no merge conflict markers in the page. My apache error log says: + + [Fri Apr 30 16:43:57 2010] [error] [client 10.64.64.42] svn: Commit failed (details follow):, referer: https://unixwiki.ncl.ac.uk/ikiwiki.cgi + [Fri Apr 30 16:43:57 2010] [error] [client 10.64.64.42] svn: Authorization failed, referer: https://unixwiki.ncl.ac.uk/ikiwiki.cgi + +-- [[Jon]]