Follow-up to r1440647.  Account for the fact that issue #4309 'wrong
notification and bogus mergeinfo during merge which adds subtree with
mergeinfo' now rears its ugly head for files as well as directories.
As an added bonus, issue #3669 'inheritance can result in mergeinfo
describing nonexistent sources' also makes an appearance.

* subversion/tests/cmdline/merge_reintegrate_tests.py

  (reintegrate_with_subtree_mergeinfo): Tweak expectations to account for
   known issues (we are *not* testing with this test) such that the test
   passes again.  Mini-brain dump in the comments explaining just what the
   heck is going on.



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