Author: stsp
Date: Wed Jun 19 15:37:42 2013
New Revision: 1494659
URL: http://svn.apache.org/r1494659
Log:
* STATUS: Nominate r1494657.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1494659&r1=1494658&r2=1494659&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun 19 15:37:42 2013
@@ -108,14 +108,15 @@ Candidate changes:
Votes:
+1: stsp, danielsh
- * r1491868
+ * r1491868, r1494657
Add missing conflict callback invocations to the update editor.
Justification:
Resolver is not invoked after some updates which flag new tree conflicts.
Votes:
+1: stsp
- -0: rhuijben (Working on a further review to avoid a possible duplicate
- callback call)
+ -0: rhuijben (without r1494657) (Working on a further review to
+ avoid a possible duplicate
+ callback call)
* r1478987, r1492020
Optimize some code that retrieves mergeinfo to obtain less unneeded
