[PATCH] XFail test to prove issue #3146

Hi Stefan,

I am attaching a patch along with this email which is an XFail test to prove
issue #3146 (tree conflicts and obstructions), which is based on your
reproduction recipe -
http://subversion.tigris.org/nonav/issues/showattachment.cgi/864/recipe-issue-3146.sh

I ve tried my best to guess the expected status/output/etc :)

[[[
On the tree-conflicts branch, add an XFail test to prove issue #3146.

* subversion/tests/cmdline/merge_tests.py
   (tree_conflicts_and_obstructions): New function.
   (test_list): Add 'tree_conflicts_and_obstructions' to test_list.

Patch by: stylesen
]]]

-- 
Senthil Kumaran S
http://www.stylesen.org/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org