urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new bug: svn commit failures...

master
Jon Dowland 2010-04-30 16:48:19 +01:00
parent f7f1dd3a38
commit 9fb15ec9fe
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn 100644
View File

@ -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]]