Author: rhuijben
Date: Tue Aug 9 01:25:57 2011
New Revision: 1155184
URL: http://svn.apache.org/viewvc?rev=1155184&view=rev
Log:
* STATUS: Add merge conflict note on r1155131
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1155184&r1=1155183&r2=1155184&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Aug 9 01:25:57 2011
@@ -163,6 +163,9 @@ Candidate changes:
Justification:
Without this patch the xml parser is only freed when http responses are
read successfully.
+ Notes:
+ This patch requires r1148932 to be backported for a clean merge.
+ Currently accept theirs on conflict produces the right result.
Votes:
+1: rhuijben
