Need review for patch to merge_tests.py 61

Hi Kamesh,

I'm trying to fix tests that currently fail on the tree-conflicts
branch. One of the failing tests is merge_tests.py 61,
"merge fails if subtree is deleted on src".

The issue about this test failing on the branch is here:
http://subversion.tigris.org/issues/show_bug.cgi?id=3141

I have attached a patch to this issue that makes the test pass
again on the branch. I'd like to get feedback from you about
this patch. Do you think it breaks the test in any way?

There is a brief comment in the patch that explains why the test
creates a tree conflict, if you have any further questions about
this, please ask. I don't assume that you've been tracking the
tree-conflicts branch, so I will try to answer any questions
about this you may have.

Thanks :)

-- 
Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner