/[Apache-SVN]
ViewVC logotype

Revision 1751923


Jump to revision: Previous Next
Author: stsp
Date: Fri Jul 8 15:22:13 2016 UTC (7 years, 9 months ago)
Changed paths: 1
Log Message:
Make the conflict resolver take the last-changed revision of the deleted node
into account while mapping a delete+copy pair to a move.

* subversion/libsvn_client/conflicts.c
  (check_move_ancestry): Make sure that a moved-here node's copyfrom revision
   is greater or equal to the moved-away node's last-changed revision.
   If copyfrom-rev < last-changed-rev, we must assume an incoming copy+delete
   operation instead of an incoming move operation.
  (find_moves_in_revision): Remove related TODO comment.


Changed paths

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

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26