Svn merge --dry-run Show svn diff

Question

I work with a codebase that (historically) has been merged manually, not through svn merge. I try to change this, proving to everyone how useful the merge is - but when I do a dry run, I get the following:

$ svn merge [[Repo URL]] . -c 21355,21358,21364,21370,21371,21373 --dry-run
--- Merging r21355 into '.':
U    [[File 1]]
--- Merging r21355 into '[[dir]]':
U    [[dir]]/[[File 2]]
U    [[dir]]/[[File 3]]
--- Merging r21358 into '[[dir]]':
U    [[dir]]/[[File 4]]
--- Merging r21364 into '[[dir]]':
U    [[dir]]/[[File 2]]
C    [[dir]]/[[File 4]]    
--- Merging r21370 into '[[dir]]':
U    [[dir]]/[[File 5]]
--- Merging r21371 into '[[dir]]':
U    [[dir]]/[[File 5]]
--- Merging r21373 into '[[dir]]':
C    [[dir]]/[[File 5]]
U    [[dir]]/[[File 6]]
Summary of conflicts:
  Text conflicts: 2

I have two files (listed as 4 and 5 respectively) that survived a single merge just to cause a conflict with the latter. I’m trying to find out what kind of conflict it is and see if I can solve it. I would like if I could make svn spit out the difference of two conflicting changes.

I checked a new working copy of only the narrowest directory, and when I started the merge without a dry run, I got:

--- Merging r21355 into '.':
U    [[File 3]]
--- Merging r21358 into '.':
U    [[File 4]]
--- Merging r21364 into '.':
G    [[File 4]]
--- Merging r21370 into '.':
U    [[File 5]]
--- Merging r21371 into '.':
G    [[File 5]]
--- Merging r21373 into '.':
G    [[File 5]]

(Files 1, 2, and 6 are located elsewhere)

, - , , ? ? , SVN, .

Answer 1

--dry-run, .

, , . G , - svn , .

:

• r21358 4.
• 4 , r21364 , diff .
• 4 r21358. , , r21364, .
• r21373 - r21370, r21371 , .
• r21371 , 5, r21370.

, , , .