Add a test for a problem whereby a merge fails to apply two successive edits to the same property, because it doesn't like the fact that the property is "locally modified" after the first edit. This can occur within a single merge-tracking merge that internally operates with multiple phases, as well as in a sequence of cherry-picking or 2-URL merges.
Add a test for a problem whereby a merge fails to apply two successive edits
to the same property, because it doesn't like the fact that the property is
"locally modified" after the first edit. This can occur within a single
merge-tracking merge that internally operates with multiple phases, as well
as in a sequence of cherry-picking or 2-URL merges.

* subversion/tests/cmdline/merge_tests.py
  (set_up_branch): Tweak the doc string.
  (svn_merge): If the expected output is not supplied, construct a reasonable
    expectation rather than accepting any output.
  (svn_propset): New function.
  (merge_two_edits_to_same_prop): New test function.
  (test_list): Add the new test as XFail.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion