Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
commit
3e6cbc3190
|
@ -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]]
|
|
@ -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
|
> I don't like config options that make wikis unsafe, but I should have
|
||||||
> revisted enabling includes for templates read from the templatedir --
|
> revisted enabling includes for templates read from the templatedir --
|
||||||
> it's easy to do, and I've done it now. --[[Joey]]
|
> it's easy to do, and I've done it now. --[[Joey]]
|
||||||
|
|
||||||
|
>> Thank you! --[[KathrynAndersen]]
|
||||||
|
|
|
@ -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
|
independent of the underlying revision control system, and can easily be
|
||||||
used without one, using it with Subversion or another revision control
|
used without one, using it with Subversion or another revision control
|
||||||
system is recommended.
|
system is recommended.
|
||||||
|
|
|
@ -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
|
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
|
would be worthwhile. Who knows, the remote site might disappear. But also
|
||||||
there are some variations on the approach that might be useful:
|
there are some variations on the approach that might be useful:
|
||||||
|
@ -649,3 +657,9 @@ page.--[[users/Chadius]]
|
||||||
> on mediawiki in general. It seems to produce output that could be
|
> on mediawiki in general. It seems to produce output that could be
|
||||||
> used by the [[plugins/contrib/mediawiki]] plugin, if the filenames
|
> used by the [[plugins/contrib/mediawiki]] plugin, if the filenames
|
||||||
> were fixed to use the right extension. --[[Joey]]
|
> were fixed to use the right extension. --[[Joey]]
|
||||||
|
|
||||||
|
>> Here's another I found while browsing around starting from the link you gave Joey<br />
|
||||||
|
>> <http://github.com/scy/levitation><br />
|
||||||
|
>> 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.
|
||||||
|
|
Loading…
Reference in New Issue