Author: philip
Date: Thu Mar 12 18:50:50 2015
New Revision: 1666274
URL: http://svn.apache.org/r1666274
Log:
* STATUS: Vote/approve property conflict resolution fix.
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=1666274&r1=1666273&r2=1666274&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Mar 12 18:50:50 2015
@@ -18,34 +18,6 @@ Status of 1.9.0:
1.9.0 candidate changes that cannot go into a later 1.9.x:
==========================================================
- * r1663338, r1663347, r1663374
- Properly record resolving of individual property conflicts.
- Justification:
- Fixes a few implementation bugs in the resolver code and exposes the
- api for more users than those that pass a callback function.
- Notes:
- Bert says it changes a public API and so needs to go into 1.9.0: see
- http://colabti.org/irclogger/irclogger_log/svn-dev?date=2015-03-10#l93
- .
- rhuijben: While the new feature of allowing the resolving of individual
- properties is not a release blocker to me, the known buggy behavior of
- the current code that may cause unuexpected loss of properties and
- conflict data is.
- .
- The part of the patch that enables the new feature is very small
- compared to the part that fixes the issue, and the regression
- test would be at least tree times harder to write and review without
- enabling the resolving of individual property conflicts.
- .
- Note that not being able to resolve individual property conflicts
- on update/switch/merge is a regression against 1.7.x, where we didn't
- switch to resolving after the update completed yet.
- .
- Votes:
- +1: rhuijben
- +1: brane (But there's no API change here, no public headers are
- modified by the backport merge.)
-
Other candidate changes:
========================
@@ -270,3 +242,31 @@ Approved changes:
internal state.
Votes:
+1: rhuijben, brane, philip
+
+ * r1663338, r1663347, r1663374
+ Properly record resolving of individual property conflicts.
+ Justification:
+ Fixes a few implementation bugs in the resolver code and exposes the
+ api for more users than those that pass a callback function.
+ Notes:
+ Bert says it changes a public API and so needs to go into 1.9.0: see
+ http://colabti.org/irclogger/irclogger_log/svn-dev?date=2015-03-10#l93
+ .
+ rhuijben: While the new feature of allowing the resolving of individual
+ properties is not a release blocker to me, the known buggy behavior of
+ the current code that may cause unuexpected loss of properties and
+ conflict data is.
+ .
+ The part of the patch that enables the new feature is very small
+ compared to the part that fixes the issue, and the regression
+ test would be at least tree times harder to write and review without
+ enabling the resolving of individual property conflicts.
+ .
+ Note that not being able to resolve individual property conflicts
+ on update/switch/merge is a regression against 1.7.x, where we didn't
+ switch to resolving after the update completed yet.
+ .
+ Votes:
+ +1: rhuijben, philip
+ +1: brane (But there's no API change here, no public headers are
+ modified by the backport merge.)
