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

response

master
Joey Hess 2010-04-30 14:15:58 -04:00
parent 3e6cbc3190
commit dd75b61d93
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
View File

@ -13,3 +13,9 @@ However there are no merge conflict markers in the page. My apache error log say
[Fri Apr 30 16:43:57 2010] [error] [client 10.64.64.42] svn: Authorization failed, 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]] -- [[Jon]]
> Only way for this to be improved would be for the svn plugin to
> explicitly check the file for conflict markers. I guess it could
> change the error message then, but the actual behavior of putting the
> changed file back in the editor so the user can recommit is about right
> as far as error recovery goes. --[[Joey]]