Author: philip
Date: Mon Dec 10 11:29:46 2012
New Revision: 1419349
URL: http://svn.apache.org/viewvc?rev=1419349&view=rev
Log:
* STATUS: vote for issue 4091 fix.
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=1419349&r1=1419348&r2=1419349&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Dec 10 11:29:46 2012
@@ -47,7 +47,7 @@ Candidate changes:
Votes:
+0: rhuijben (I would like to see some test results before backporting)
- * r1407131, r1407812, r1408650
+ * r1295418, r1407131, r1407812, r1408650
Properly handle incoming changes on symlinks (issue #4091)
Justification:
Regression since 1.6.x. Users get unexpected tree conflicts
@@ -58,8 +58,7 @@ Candidate changes:
Branch:
^/subversion/branches/1.7.x-r1407131/
Votes:
- +1: rhuijben
- -0: philip (needs r1295418 for test to run but it still FAILs)
+ +1: rhuijben (not r1295418 and associated change), philip
* r1409804
Add a delimiter between the two chains in svn_error_compose_create().
