Author: cmpilato
Date: Thu Dec 2 15:55:25 2010
New Revision: 1041421
URL: http://svn.apache.org/viewvc?rev=1041421&view=rev
Log:
Note how to resolve conflicts with the merge of the r879293 group.
Modified:
subversion/branches/1.5.x/STATUS
Modified: subversion/branches/1.5.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.5.x/STATUS?rev=1041421&r1=1041420&r2=1041421&view=diff
==============================================================================
--- subversion/branches/1.5.x/STATUS (original)
+++ subversion/branches/1.5.x/STATUS Thu Dec 2 15:55:25 2010
@@ -137,9 +137,12 @@ Candidate changes for 1.5.9:
Justification:
The broken behavior is inconsistent with the way MIME mapping
files are used everywhere else in the world.
+ Notes:
+ This merge will conflict due to changes in the path APIs. Use
+ --accept=theirs-conflict to merge it, and then replace the one
+ introduced call to svn_dirent_local_style() with svn_path_local_style().
Votes:
+1: cmpilato
- -0: this change conflicts when merged
* r880082
Respect Apache's ServerSignature directive.
