On branch tc-resolve:
On branch tc-resolve:

Tweak the tree_conflicts_resolved_depth* tests to use separate directories
in one case. Not separating the case where the update currently fails to
report a tree-conflict properly, because it's nice to have a test for it.

* subversion/tests/cmdline/depth_tests.py
  (make_depth_tree_conflicts, tree_conflicts_resolved_depth_empty,
  tree_conflicts_resolved_depth_files,
  tree_conflicts_resolved_depth_immediates,
  tree_conflicts_resolved_depth_infinity):
    Instead of 'A/B/lambda', 'A/B/E' and 'A/B/E/alpha',
    rather use 'A/mu', 'A/B' and 'A/D/gamma'.


git-svn-id: e30ffc19aac6e5cdba5dc38eb61c445904a5a84c@874238 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion