You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ar...@apache.org on 2011/08/06 16:13:19 UTC
svn commit: r1154524 - /subversion/branches/1.7.x/STATUS
Author: arfrever
Date: Sat Aug 6 14:13:19 2011
New Revision: 1154524
URL: http://svn.apache.org/viewvc?rev=1154524&view=rev
Log:
* STATUS: Nominate r1151906 and r1154121. Vote for some revisions.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1154524&r1=1154523&r2=1154524&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Aug 6 14:13:19 2011
@@ -82,7 +82,7 @@ Candidate changes:
+1: pburba, rhuijben
-0: gstein (the serf 2.x API will be incompatible with 1.7.x, so this
will never be useful)
-
+
* r1154165
Make the cmdline argument parser ignore upgrade required errors to
allow calling 'svn upgrade c:\iNVALID' on 'C:\Invalid' without an
@@ -92,15 +92,15 @@ Candidate changes:
(Triggerable in other scenarios)
http://svn.haxx.se/users/archive-2011-08/0142.shtml
Votes:
- +1: rhuijben
+ +1: rhuijben, arfrever
- * 1154009,r1154273
+ * r1154009, r1154273
Fix issue #3978 'Reverse merge which adds subtree fails'
Justification:
Prevents an assertion during a legitimate merge.
Notes: r1154009 is the fix, r1154273 is a test.
Votes:
- +1: pburba
+ +1: pburba, arfrever
* r1154278, r1154379, r1154382
Make 'svn ls' capable of listing Subversion 1.0-1.3 repositories using
@@ -119,14 +119,18 @@ Candidate changes:
Votes:
+1: rhuijben
- * 1154461
- Initialize the is_binary member of the svn_wc_conflict_description2_t
- correctly, not unconditionally to false.
+ * r1151906
+ Allow proper translation of some messages.
+ Votes:
+ +1: arfrever
+
+ * r1154121
+ Improve a message.
Justification:
- Easy and obvious fix. Without this, the TSVN UI shows the wrong info and
- doesn't resolve conflicts correctly.
+ Translators won't have to maintain separate translations of help message
+ for 'svn mergeinfo' on trunk and 1.7.x branch.
Votes:
- +1: steveking, rhuijben
+ +1: arfrever
Veto-blocked changes:
=====================
@@ -179,3 +183,12 @@ Veto-blocked changes:
Approved changes:
=================
+
+ * r1154461
+ Initialize the is_binary member of the svn_wc_conflict_description2_t
+ correctly, not unconditionally to false.
+ Justification:
+ Easy and obvious fix. Without this, the TSVN UI shows the wrong info and
+ doesn't resolve conflicts correctly.
+ Votes:
+ +1: steveking, rhuijben, arfrever