You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by pb...@apache.org on 2009/12/18 02:49:29 UTC

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

Author: pburba
Date: Fri Dec 18 01:49:29 2009
New Revision: 892095

URL: http://svn.apache.org/viewvc?rev=892095&view=rev
Log:
* STATUS: Nominate r892050 and r892085.

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=892095&r1=892094&r2=892095&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Fri Dec 18 01:49:29 2009
@@ -126,6 +126,17 @@
    Votes:
      +1: stsp
 
+ * r892050, 892085
+   Fix a reintegrate bug which can occur when the merge source has mergeinfo
+   that explicitly describes common history with the reintegrate target.
+   Justification:
+     Reintegrate merges may not work if the reintegrate source has self-
+     referential mergeinfo that is also self-referential to the reintegrate
+     target.  This occured in our own repository, see
+     http://svn.haxx.se/dev/archive-2009-12/0338.shtml.
+   Votes:
+     +1: pburba
+
 Veto-blocked changes:
 
  * r877552, r877617, r877618, r877619, r877621