[SVN-4319] phantom tree conflicts when merge target subtree unreadable

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Won't Fix
• Affects Version/s: trunk
• Fix Version/s: 1.8.0
• Component/s: unknown
• Assignee: Unassigned
• Reporter: Paul Burba
• Created: 13/Feb/13 19:12
• Updated: 27/Oct/18 16:27
• Resolved: 12/Mar/13 23:53

Description

As described here http://svn.haxx.se/dev/archive-2013-01/0567.shtml , merge
notifications are a bit off when incoming changes land in a subtree which the
merger doesn't have access to.

Given this authz:

[[[
[merge_authz_tests-4:/A/C]
jrandom=
[merge_authz_tests-4:/]
jrandom=rw
]]]

### And these changes to merge from ^/A to branch:

>svn diff --summarize ^^/A -r1:3
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/nu
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P/Q/R/S/T/U/V/W
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P/Q/R/S/T/U/V
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P/Q/R/S/T/U
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P/Q/R/S/T
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P/Q/R/S
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P/Q/R
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P/Q
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O/P
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N/O
A      
http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M/N
A       http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L/M
A       http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K/L
A       http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J/K
A       http://localhost/svn-test-work/repositories/merge_authz_tests-4/A/C/J

### The merge erroneously shows additions within the unreadable
### (and missing from the WC) subdirectory:

>svn merge ^^/A branch -r1:3
Skipped missing target: 'branch\C'
   A branch\C\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z\nu
   A branch\C\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
   A branch\C\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y
   A branch\C\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X
   A branch\C\J\K\L\M\N\O\P\Q\R\S\T\U\V\W
   A branch\C\J\K\L\M\N\O\P\Q\R\S\T\U\V
   A branch\C\J\K\L\M\N\O\P\Q\R\S\T\U
   A branch\C\J\K\L\M\N\O\P\Q\R\S\T
   A branch\C\J\K\L\M\N\O\P\Q\R\S
   A branch\C\J\K\L\M\N\O\P\Q\R
   A branch\C\J\K\L\M\N\O\P\Q
   A branch\C\J\K\L\M\N\O\P
   A branch\C\J\K\L\M\N\O
   A branch\C\J\K\L\M\N
   A branch\C\J\K\L\M
   A branch\C\J\K\L
   A branch\C\J\K
   A branch\C\J
--- Recording mergeinfo for merge of r2 through r3 into 'branch':
 U   branch
Summary of conflicts:
  Skipped paths: 1

### The WC is still correct though, showing only mergeinfo mods:

>svn st
 M      branch

>svn pl -vR
Properties on 'branch':
  svn:mergeinfo
    /A:2-3*

C:\SVN\src-trunk\Debug\subversion\tests\cmdline\svn-test-work\working_copies\merge_authz_tests-4>