Author: rhuijben Date: Fri Oct 14 15:04:03 2016 New Revision: 1764928 URL: http://svn.apache.org/viewvc?rev=1764928&view=rev Log: * STATUS: Cast vote. Approve issue #4647 group.
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=1764928&r1=1764927&r2=1764928&view=diff ============================================================================== --- subversion/branches/1.9.x/STATUS (original) +++ subversion/branches/1.9.x/STATUS Fri Oct 14 15:04:03 2016 @@ -57,21 +57,6 @@ Candidate changes: Votes: +1: rhuijben -* r1758128, r1758129, r1758130, r1758153 - 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. - r1758153 corrects paths in the original fix. - r1758128 adds the regression test. - r1758130 removes the regression test's XFail marker - Votes: - +1 (non-binding): luke1410 - +1: stsp, stefan2 - * r1734106 Fix a bug where the wrong source left revision was recorded in a tree conflict. @@ -144,3 +129,18 @@ Veto-blocked changes: Approved changes: ================= + +* r1758128, r1758129, r1758130, r1758153 + 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. + r1758153 corrects paths in the original fix. + r1758128 adds the regression test. + r1758130 removes the regression test's XFail marker + Votes: + +1 (non-binding): luke1410 + +1: stsp, stefan2, rhuijben