Log Message: |
Fix issue #4766, "resolver adds unrelated moves to move target list"
* subversion/libsvn_client/conflicts.c
(find_operative_moves): Fix the logic which detects operative nested moves
to keep a couple of unrelated conflict resolver tests passing; some tests
were only passing because this code added *every* move found in the deleted
revision. Add only operative moves to the list to fix issue #4766.
Note to reviewers: See notes/resolve-moves for definition of "nested move".
(reparent_session_and_fetch_node_kind): Remove, now unused.
* subversion/tests/libsvn_client/conflicts-test.c
(test_funcs): Issue #4766 test is now passing.
|