tree ba1ebfd5e835f87eef44b084aba775b70a22d4dc
parent 83d15d085c0142062c3416d7227799ca6e0e4f71
author Stefan Sperling <stsp@apache.org> 1467991333 +0000
committer Stefan Sperling <stsp@apache.org> 1467991333 +0000

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.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1751923 13f79535-47bb-0310-9956-ffa450edef68