/[Apache-SVN]
ViewVC logotype

Revision 1836968


Jump to revision: Previous Next
Author: stsp
Date: Sun Jul 29 12:22:24 2018 UTC (5 years, 8 months ago)
Changed paths: 2
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.


Changed paths

Path Details
Directorysubversion/trunk/subversion/libsvn_client/conflicts.c modified , text changed
Directorysubversion/trunk/subversion/tests/libsvn_client/conflicts-test.c modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26