Author: pburba
Date: Fri Feb 18 16:19:18 2011
New Revision: 1072040
URL: http://svn.apache.org/viewvc?rev=1072040&view=rev
Log:
* STATUS: Note r1036429 dependence on the issue #3641 group. Note that the
962377 group *is* issue #3641. Lastly, add r1036978 and r1037762 to the
issue #3641 group (those are needed to avoid a conflict and contain changes
to the test data that the other revisions in this group expect).
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=1072040&r1=1072039&r2=1072040&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Fri Feb 18 16:19:18 2011
@@ -116,10 +116,10 @@ Candidate changes:
+1: philip
+0: stsp (it fixes the test, but pburba asked on IRC how this change
will affect replaced directories and I'm not sure about that)
- +0: pburba (we need to either backport this change or revert
- r962377-962378 or hack up a better fix for issue #3641 and
- backport that - see
- http://svn.haxx.se/dev/archive-2010-11/0412.shtml)
+ +0: pburba (since we reverted r962377-962378 in r1037005 - see
+ http://svn.haxx.se/dev/archive-2010-11/0412.shtml, this
+ change is now dependent on the new set of issue #3641 fixes
+ that are currently nominated.)
+1: danielsh (pburba: a fix to #3641 was committed to trunk)
* r1028084, r1028125, r1041638
@@ -205,14 +205,15 @@ Candidate changes:
Votes:
+1: julianfoad, stsp
- * r962377, r962378, r1063572, r1063573, r1063592
- Fix svnsync handling of directory copyfrom.
+ * r962377, r962378, r1036978, r1037762, r1063572, r1063573, r1063592
+ Fix issue #3641 svnsync handling of directory copyfrom.
Justification:
Could lead to sync'd repositories being different from the master.
Concerns:
http://article.gmane.org/gmane.comp.version-control.subversion.devel/120590
Votes:
- +1: cmpilato (r962377, r962378 only), philip
+ +1: cmpilato (r962377, r962378 only)
+ +1: philip (962377, r962378, r1063572, r1063573, r1063592 only)
-0: danielsh (authz concerns)
Veto-blocked changes:
