subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1165274 - /subversion/branches/1.7.x/STATUS
Date Mon, 05 Sep 2011 13:21:32 GMT
Author: stsp
Date: Mon Sep  5 13:21:32 2011
New Revision: 1165274

URL: http://svn.apache.org/viewvc?rev=1165274&view=rev
Log:
* STATUS: Vote for issue #4003 and #4004 fixes, approving.

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=1165274&r1=1165273&r2=1165274&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Sep  5 13:21:32 2011
@@ -104,37 +104,6 @@ Candidate changes:
      +1: rhuijben
      +1: gstein (for 1.7.1)
 
- * r1164517, r1164580
-   Fix issue #4003 ("'svn patch' seems unable to delete properties"). 
-   Justification:
-     This fixes a lack of consistency with how emptied file contents
-     are handled.
-   Notes:
-     r1164517 adds the XFail regression test.
-     r1164580 fixes the bug and expects test passage.
-     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, philip
-
- * r1164535, r1164554
-   Fix issue #4004 ("'svn patch --reverse-diff' chokes on patches
-   which add files with props").
-   Justification:
-     Prevents failure from a use-case that folks will naturally expect
-     to work: "svn diff > PATCH && svn patch PATH --reverse-diff"
-   Notes:
-     r1164535 adds the XFail regression tests.
-     r1164554 fixes the bug and expects test passage.
-     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, philip
-
  * r1164426,r1164614
    Fix STMT_SELECT_NODE_CHILDREN_WALKER_INFO for correctness and speed.
    Justification:
@@ -224,3 +193,34 @@ Approved changes:
      for RC2.
    Votes:
      +1: pburba, stsp, philip
+
+ * r1164517, r1164580
+   Fix issue #4003 ("'svn patch' seems unable to delete properties"). 
+   Justification:
+     This fixes a lack of consistency with how emptied file contents
+     are handled.
+   Notes:
+     r1164517 adds the XFail regression test.
+     r1164580 fixes the bug and expects test passage.
+     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, philip, stsp
+
+ * r1164535, r1164554
+   Fix issue #4004 ("'svn patch --reverse-diff' chokes on patches
+   which add files with props").
+   Justification:
+     Prevents failure from a use-case that folks will naturally expect
+     to work: "svn diff > PATCH && svn patch PATH --reverse-diff"
+   Notes:
+     r1164535 adds the XFail regression tests.
+     r1164554 fixes the bug and expects test passage.
+     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, philip, stsp



Mime
View raw message