subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1165251 - /subversion/branches/1.7.x/STATUS
Date Mon, 05 Sep 2011 12:07:39 GMT
Author: philip
Date: Mon Sep  5 12:07:39 2011
New Revision: 1165251

URL: http://svn.apache.org/viewvc?rev=1165251&view=rev
Log:
* STATUS: Vote for issues 4003 and 4004.

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=1165251&r1=1165250&r2=1165251&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Sep  5 12:07:39 2011
@@ -141,8 +141,9 @@ Candidate changes:
      Merge this with --accept=mine-conflict, and then manually remove
      the @XFail() line from the patch_tests.py:patch_deletes_prop()
      function.
+     Only one of (r1164517, r1164580) and (r1164535, r1164554) will conflict.
    Votes:
-     +1: cmpilato
+     +1: cmpilato, philip
 
  * r1164535, r1164554
    Fix issue #4004 ("'svn patch --reverse-diff' chokes on patches
@@ -156,8 +157,9 @@ Candidate changes:
      Merge this with --accept=mine-conflict, and then manually remove
      the @XFail() line from the patch_tests.py:patch_reversed_add_with_props()
      function.
+     Only one of (r1164517, r1164580) and (r1164535, r1164554) will conflict.
    Votes:
-     +1: cmpilato
+     +1: cmpilato, philip
 
  * r1164426,r1164614
    Fix STMT_SELECT_NODE_CHILDREN_WALKER_INFO for correctness and speed.



Mime
View raw message