subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1164050 - /subversion/branches/1.7.x/STATUS
Date Thu, 01 Sep 2011 12:41:47 GMT
Author: philip
Date: Thu Sep  1 12:41:47 2011
New Revision: 1164050

URL: http://svn.apache.org/viewvc?rev=1164050&view=rev
Log:
* STATUS: Vote/approve r1161683/r1161721.

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=1164050&r1=1164049&r2=1164050&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Sep  1 12:41:47 2011
@@ -58,22 +58,6 @@ Candidate changes:
    Votes:
      +1: rhuijben, cmpilato
 
- * r1161683, r1161721
-   Fix issue #3976 "record-only merges which add new subtree mergeinfo don't
-   record mergeinfo describing merge".
-   Justification:
-      Avoid repeat merges and possible spurious conflicts in merges subsequent
-      to a --record-only merge which adds mergeinfo to a subtree which had no
-      explicit mergeinfo prior to the merge.  Ok, that's a mouthful, to put it
-      more succinctly: A --record-only merge of revision X should block future
-      merges of revision X, but that wasn't happening here.
-   Notes:
-     r1161683 is a new test for this issue and r1161721 is the fix.
-   Branch:
-     ^/subversion/branches/1.7.x-issue3976
-   Votes:
-     +1: pburba, stsp
-
  * r1147299, r1162974, r1162995
    Fix issue #3867 'reintegrate merges create mergeinfo for non-existent
    paths' and issue #3961 'reintegrate merge of replaced source produces
@@ -141,3 +125,19 @@ Veto-blocked changes:
 
 Approved changes:
 =================
+
+ * r1161683, r1161721
+   Fix issue #3976 "record-only merges which add new subtree mergeinfo don't
+   record mergeinfo describing merge".
+   Justification:
+      Avoid repeat merges and possible spurious conflicts in merges subsequent
+      to a --record-only merge which adds mergeinfo to a subtree which had no
+      explicit mergeinfo prior to the merge.  Ok, that's a mouthful, to put it
+      more succinctly: A --record-only merge of revision X should block future
+      merges of revision X, but that wasn't happening here.
+   Notes:
+     r1161683 is a new test for this issue and r1161721 is the fix.
+   Branch:
+     ^/subversion/branches/1.7.x-issue3976
+   Votes:
+     +1: pburba, stsp, philip



Mime
View raw message