Author: pburba Date: Tue Jun 8 20:18:35 2010 New Revision: 952803 URL: http://svn.apache.org/viewvc?rev=952803&view=rev Log: * STATUS: Vote for issue #3623.
Note: cmpilato noted that r939375 could be merged to 1.6.x with a conflict and we could simply accept theirs-conflict. That works and the test will run, but it still isn't quite right and the test will fail, see http://svn.apache.org/viewvc?view=revision&revision=952795. 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=952803&r1=952802&r2=952803&view=diff ============================================================================== --- subversion/branches/1.6.x/STATUS (original) +++ subversion/branches/1.6.x/STATUS Tue Jun 8 20:18:35 2010 @@ -149,11 +149,11 @@ Candidate changes: This can actually result in what is arguably a corrupt working copy, one that thinks it is in sync with the repository but actually is not. Notes: - r939375 tweaks a test to cover this case. There's a minor conflict - with its merge with a single deleted function call. (Keep 'theirs'.) - r939376 is the fix. It merges cleanly. + r939375 tweaks a test to cover this case. r939376 is the fix. + Branch: + ^/subversion/branches/1.6.x-issue3623 Votes: - +1: cmpilato + +1: cmpilato, pburba * r945708 Fix issue #3469 "tree conflict inside of directory external causes
