You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2013/06/12 10:02:31 UTC
svn commit: r1492104 - /subversion/branches/1.8.x/STATUS
Author: danielsh
Date: Wed Jun 12 08:02:31 2013
New Revision: 1492104
URL: http://svn.apache.org/r1492104
Log:
Fix whitespace for parseability
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=1492104&r1=1492103&r2=1492104&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun 12 08:02:31 2013
@@ -99,37 +99,37 @@ Candidate changes:
Votes:
+1: stefan2, blair
- * r1491739, r1491755, r1491762
- Improve interactive conflict resolution menu.
- Justification:
- The current menu is too hard to figure out for users.
- See http://svn.haxx.se/dev/archive-2013-06/0147.shtml
- Votes:
- +1: stsp
-
- * r1491816
- Add two additional options to interactive file merge.
- Justification:
- Usability enhancement for quicker conflict resolution in some cases.
- Very simple change. Only affects interactive mode, not scripts.
- Votes:
- +1: stsp
-
- * r1491868
- 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, rhuijben
-
- * r1492005, r1492020
- Optimize 'svn mergeinfo --show-revs' network usage and a similar case in the
- merge code.
- Justification:
- Simple fixes to improve performance.
- Votes:
- +1: ivan (without r1492020)
- +1: rhuijben
+ * r1491739, r1491755, r1491762
+ Improve interactive conflict resolution menu.
+ Justification:
+ The current menu is too hard to figure out for users.
+ See http://svn.haxx.se/dev/archive-2013-06/0147.shtml
+ Votes:
+ +1: stsp
+
+ * r1491816
+ Add two additional options to interactive file merge.
+ Justification:
+ Usability enhancement for quicker conflict resolution in some cases.
+ Very simple change. Only affects interactive mode, not scripts.
+ Votes:
+ +1: stsp
+
+ * r1491868
+ 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, rhuijben
+
+ * r1492005, r1492020
+ Optimize 'svn mergeinfo --show-revs' network usage and a similar case in the
+ merge code.
+ Justification:
+ Simple fixes to improve performance.
+ Votes:
+ +1: ivan (without r1492020)
+ +1: rhuijben
Veto-blocked changes:
=====================