svn commit: r955943 - /subversion/branches/1.6.x/STATUS

[ju...@apache.org]

Author: julianfoad
Date: Fri Jun 18 11:23:03 2010
New Revision: 955943

URL: http://svn.apache.org/viewvc?rev=955943&view=rev
Log:
* STATUS: Vote for and approve issue #3623, r939375-939376.

Modified:
    subversion/branches/1.6.x/STATUS

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=955943&r1=955942&r2=955943&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Fri Jun 18 11:23:03 2010
@@ -97,19 +97,6 @@ Candidate changes:
    Votes:
      +1: kameshj
 
- * r939375-939376
-   Fix issue #3623, a bug in foreign repository merges that causes properties
-   on merge-added files to be dropped from commits of those merges.
-   Justification:
-     This can actually result in what is arguably a corrupt working copy,
-     one that thinks it is in sync with the repository but actually is not.
-   Notes:
-     r939375 tweaks a test to cover this case.  r939376 is the fix.
-   Branch:
-     ^/subversion/branches/1.6.x-issue3623
-   Votes:
-     +1: cmpilato, pburba
-
  * r950445, 950468
    Fix for issue #2591 "'svnadmin hotcopy' does not replicate symlinks".
    Justification:
@@ -199,3 +186,17 @@ Veto-blocked changes:
 
 Approved changes:
 =================
+
+ * r939375-939376
+   Fix issue #3623, a bug in foreign repository merges that causes properties
+   on merge-added files to be dropped from commits of those merges.
+   Justification:
+     This can actually result in what is arguably a corrupt working copy,
+     one that thinks it is in sync with the repository but actually is not.
+   Notes:
+     r939375 tweaks a test to cover this case.  r939376 is the fix.
+     Two simple conflicts occur when merging these two revisions.
+   Branch:
+     ^/subversion/branches/1.6.x-issue3623
+   Votes:
+     +1: cmpilato, pburba, julianfoad