Author: philip Date: Wed Apr 24 16:21:54 2013 New Revision: 1471507 URL: http://svn.apache.org/r1471507 Log: * STATUS: Vote.
Modified: subversion/branches/1.8.x/STATUS Modified: subversion/branches/1.8.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1471507&r1=1471506&r2=1471507&view=diff ============================================================================== --- subversion/branches/1.8.x/STATUS (original) +++ subversion/branches/1.8.x/STATUS Wed Apr 24 16:21:54 2013 @@ -51,7 +51,7 @@ Candidate changes: want to backport changes to 'svn' to report property conflicts better, and then 'svn' may use these fields; I'm working on such a change. Votes: - +1: julianfoad + +1: julianfoad, philip +0.5: rhuijben (after this patch the situation is better, but I'm not sure if it is optimal. In merge there are 4 trees to consider before we can tell the reason. The 4th tree