summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJon Dowland <jmtd@debian.org>2010-04-30 16:48:19 +0100
committerJon Dowland <jmtd@debian.org>2010-04-30 16:48:19 +0100
commit9fb15ec9fec8903776be0be01eaed0e7bb7d5009 (patch)
tree268368c8d6dac5a609cd43e27d8000cb00317ebe /doc
parentf7f1dd3a3852ef158a577387faee2c34c4f9cfad (diff)
new bug: svn commit failures...
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn15
1 files changed, 15 insertions, 0 deletions
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]]