subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From luke1...@apache.org
Subject svn commit: r1758131 - /subversion/branches/1.9.x/STATUS
Date Sun, 28 Aug 2016 16:31:01 GMT
Author: luke1410
Date: Sun Aug 28 16:31:01 2016
New Revision: 1758131

URL: http://svn.apache.org/viewvc?rev=1758131&view=rev
Log:
* STATUS: Nominate r1758128-30

Modified:
    subversion/branches/1.9.x/STATUS

Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1758131&r1=1758130&r2=1758131&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Sun Aug 28 16:31:01 2016
@@ -114,6 +114,19 @@ Candidate changes:
    Votes:
      +1 stsp
 
+* r1758128, r1758129, r1758130
+  Fix issue #4647.
+  Justification:
+    Resolves a regression in TSVN 1.9 with the binary conflict resolution
+    dialog erroring out when selecting to resolve the conflict with the
+    local file.
+  Notes:
+    r1758129 contains the actual fix.
+    r1758128 adds the regression test.
+    r1758130 removes the regression test's XFail marker
+  Votes:
+    +1 (non-binding): luke1410
+
 Veto-blocked changes:
 =====================
 



Mime
View raw message