diff options
| author | Joey Hess <joey@kitenet.net> | 2010-04-30 14:15:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-04-30 14:15:58 -0400 |
| commit | dd75b61d9332e50364f97fc04179ab895bfc2ef8 (patch) | |
| tree | 96f05b477915bd6c31998da02726bab9bdf31dc6 /doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn | |
| parent | 3e6cbc319094fa088c873071cabf7b7bf7add0eb (diff) | |
| download | ikiwiki-dd75b61d9332e50364f97fc04179ab895bfc2ef8.tar ikiwiki-dd75b61d9332e50364f97fc04179ab895bfc2ef8.tar.gz | |
response
Diffstat (limited to 'doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn')
| -rw-r--r-- | doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn | 6 |
1 files changed, 6 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 index 09753b4ee..0c9bce4b9 100644 --- a/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn +++ b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn @@ -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 -- [[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]] |