Author: pburba
Date: Mon Jul 18 17:17:08 2011
New Revision: 1147976
URL: http://svn.apache.org/viewvc?rev=1147976&view=rev
Log:
* STATUS: Nominate r1146121 and r1146870.
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=1147976&r1=1147975&r2=1147976&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Jul 18 17:17:08 2011
@@ -42,5 +42,18 @@ Candidate changes:
Votes:
+0: danielsh
+ * r1146121, r1146870
+ Fix issue #3957 'reintegrate fails with no subtree mergeinfo on source'.
+ Justification:
+ Fixes an obvious bug in the issue #3242 fix (r1146870), albeit a bug
+ with no readily apparent manifestation on 1.7.x.
+ Notes:
+ r1146121 is a test, r1146870 is the fix. The new test only failed on
+ 1.6.x. It doesn't fail on 1.7.x because of other changes in 1.7 which
+ make reintegrate merges more tolerant of subtree mergeinfo, see
+ http://subversion.tigris.org/issues/show_bug.cgi?id=3957#desc8
+ Votes:
+ +1: pburba
+
Approved changes:
=================
