Author: cmpilato
Date: Thu Dec 2 15:33:47 2010
New Revision: 1041411
URL: http://svn.apache.org/viewvc?rev=1041411&view=rev
Log:
Vote for the r876804 group, approving.
Modified:
subversion/branches/1.5.x/STATUS
Modified: subversion/branches/1.5.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.5.x/STATUS?rev=1041411&r1=1041410&r2=1041411&view=diff
==============================================================================
--- subversion/branches/1.5.x/STATUS (original)
+++ subversion/branches/1.5.x/STATUS Thu Dec 2 15:33:47 2010
@@ -49,22 +49,6 @@ Candidate changes for 1.5.9:
Votes:
+1: pburba
- * r876804, r876840, r876849
- Fix issue #3383 'Foreign repository merge can add mergeinfo from the
- foreign repos'
- Justification:
- At best this mergeinfo refers to non-existent paths in the target's
- repos. At worst the mergeinfo intersects with actual path/revisions
- in the merge target. The latter might cause real problems, making it
- appear merges have been done that actually have not or vice-versa.
- Notes:
- r876849 is the fix, the other revisions are expansion of an existing
- merge test to cover this issue. There are some minor conflicts, a
- backport branch can be found at
- http://svn.collab.net/repos/svn/branches/1.5.x-r36775.
- Votes:
- +1: pburba, arfrever
-
* r877146, r877157
Fix issue #3392 'Parsing error with reverse merges and non-inheritable
mergeinfo'
@@ -225,3 +209,18 @@ Approved changes:
+1: stsp, philip, pburba
(For 1.6.x there was +1: pburba, cmpilato, hwright)
+ * r876804, r876840, r876849
+ Fix issue #3383 'Foreign repository merge can add mergeinfo from the
+ foreign repos'
+ Justification:
+ At best this mergeinfo refers to non-existent paths in the target's
+ repos. At worst the mergeinfo intersects with actual path/revisions
+ in the merge target. The latter might cause real problems, making it
+ appear merges have been done that actually have not or vice-versa.
+ Notes:
+ r876849 is the fix, the other revisions are expansion of an existing
+ merge test to cover this issue. There are some minor conflicts, a
+ backport branch can be found at ^subversion/branches/1.5.x-r36775.
+ Votes:
+ +1: pburba, arfrever, cmpilato
+
