You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2013/01/26 11:35:57 UTC

svn commit: r1438874 - /subversion/branches/1.7.x/STATUS

Author: stsp
Date: Sat Jan 26 10:35:56 2013
New Revision: 1438874

URL: http://svn.apache.org/viewvc?rev=1438874&view=rev
Log:
* STATUS: Nominate issue #4306 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=1438874&r1=1438873&r2=1438874&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Jan 26 10:35:56 2013
@@ -205,6 +205,16 @@ Candidate changes:
    Votes:
      +1: rhuijben
 
+ * r1438602, r1438683
+   Fix issue #4306, "multiple editor drive file merges record wrong mergeinfo
+   during conflicts"
+   Justification:
+     Bogus mergeinfo is created during conflicting merges with file targets.
+   Branch:
+     ^/subversion/branches/1.7.x-issue4306
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================