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/05/14 18:59:00 UTC
svn commit: r1482459 - /subversion/branches/1.8.x/STATUS
Author: danielsh
Date: Tue May 14 16:58:59 2013
New Revision: 1482459
URL: http://svn.apache.org/r1482459
Log:
* STATUS: Explain how to resolve the merge conflict.
While here, add a spelling fix to the r1480080 group.
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=1482459&r1=1482458&r2=1482459&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue May 14 16:58:59 2013
@@ -16,7 +16,7 @@ Status of 1.8.0:
Candidate changes:
==================
- * r1480080, r1481772
+ * r1480080, r1481772, r1481847
Instruct clang to not warn about unknown warning flags.
Justification:
Newer versions of clang accept warning flags that they do not
@@ -61,7 +61,10 @@ Candidate changes:
+1: brane (for 1.8.1)
-0: philip (on r1469519, r1469520, no vote on r1481848, 1481870;
see dev thread: it's a false alarm, wrong value)
- -0: rhuijben, breser (merge conflict in configure.ac in r1481848)
+ -0: rhuijben, breser (merge conflict in configure.ac in r1481848
+ <danielsh> would be resolved by the r1480080 group,
+ or by merging r1481848 without the unintentional
+ configure.ac part)
* r1482436
Resolve regression in svn_ra_replay_range() where it didn't apply