Simplify some 'can we record a move' calculations, to avoid scheduling unneeded
db queries during delete processing.

* subversion/libsvn_wc/wc_db.c
  (delete_update_movedto): Assert that the query matches a row.

  (delete_node): Properly calculate when we can track moves and when not to
    avoid performing unneeded database queries.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1451326 13f79535-47bb-0310-9956-ffa450edef68
Restore test for issue #3577 which got accidentally got removed by some
jerk[1] way back in r953878.

* subversion/tests/cmdline/merge_reintegrate_tests.py

  (reintegrate_with_subtree_merges): Adjust expected mergeinfo recording
   notifications as per the issue #3671 fixes in r961055.

  (test_list): Tests are awesome.  Actually running them is even better.

[1] that would be me


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