Author: pburba
Date: Wed Dec 5 18:16:19 2012
New Revision: 1417562
URL: http://svn.apache.org/viewvc?rev=1417562&view=rev
Log:
* STATUS: Vote -0 for the r1408632 group, noting text conflicts.
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=1417562&r1=1417561&r2=1417562&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Dec 5 18:16:19 2012
@@ -58,6 +58,9 @@ Candidate changes:
Votes:
+1: danielsh, rhuijben
-0: philip (merge conflict svnmucc renamed)
+ -0: pburba (I tried --ignore-ancestry file merges directly to svnmucc.c
+ to side-step the rename tree conflict, but there are still
+ text conflicts with r1408684)
* r1407131, r1407812, r1408650
Properly handle incoming changes on symlinks (issue #4091)
