Modify an exiting merge test to also cover issue #3591 'reintegrate merges update subtree mergeinfo unconditionally'.
Modify an exiting merge test to also cover issue #3591 'reintegrate merges
update subtree mergeinfo unconditionally'.

* subversion/tests/cmdline/merge_tests.py

  (reintegrate_with_self_referential_mergeinfo): Change expectations of
   reintegrate merge such that subtrees with explicit mergeinfo, which are
   not affected by the merge, don't have their mergeinfo updated.

  (test_list): Mark reintegrate_with_self_referential_mergeinfo as XFail.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@917660 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion