Author: stsp
Date: Mon Mar 21 18:33:52 2011
New Revision: 1083893
URL: http://svn.apache.org/viewvc?rev=1083893&view=rev
Log:
* STATUS: Add r1076826 to the r1083883 group.
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=1083893&r1=1083892&r2=1083893&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Mon Mar 21 18:33:52 2011
@@ -224,12 +224,15 @@ Candidate changes:
+0: hwright (I like the idea, but have no knowledge of the change, or
ability to test it.)
- * r1083883
+ * r1083883, r1076826
Fix issue #3816, "file external can cause mixed-revision working
copy after checkout"
Justification:
Without this fix, file externals pinned to a revision can prevent
reintegrate merges.
+ Notes:
+ r1083883 is the actual fix and has no corresponding trunk revision.
+ r1076826 added a test case on trunk (merged to the branch in r1083892).
Branch:
^/subversion/branches/1.6.x-issue3816
Votes:
