Checkout Tools
  • last updated 5 hours ago
Constraints: committers
Constraints: files
Constraints: dates
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/

(make_depth_tree_conflicts, tree_conflicts_resolved_depth_empty,




Instead of 'A/B/lambda', 'A/B/E' and 'A/B/E/alpha',

rather use 'A/mu', 'A/B' and 'A/D/gamma'.

On branch tc-resolve:

Fix the behaviour of "resolved" that descends into unversioned

tree-conflicts even if the depth doesn't allow that.

* subversion/libsvn_wc/entries.c

(visit_tc_too_baton_t): Add TARGET and DEPTH fields.


Use new TARGET and DEPTH fields in the baton to determine whether to

descend into unversioned tree-conflicted children of a directory.

(svn_wc__walk_entries_and_tc): Supply TARGET and DEPTH to the baton.

* subversion/tests/cmdline/


Make a "resolved" test also try run "resolved" on the victim's

parent first, to make sure it doesn't resolve its children.

Remove comment about not supporting "resolved" per victim.

* subversion/tests/cmdline/

(tree_conflicts_resolved_depth_empty, tree_conflicts_resolved_depth_files,


tree_conflicts_resolved_depth_infinity, make_depth_tree_conflicts):

Four new tests and a helper. The tests are XFAIL because the helper

make_depth_tree_conflicts() exposes an error in update code that

is not related to "resolved". Separate trials suggest that these

tests will pass as soon as the update issue is resolved. See

inline comment in make_depth_tree_conflicts() marked "##".

(test_list): Add the new tests.

  1. … 2 more files in changeset.