Re: [PATCH] Test for issue 2135

On 9/1/05, Ivan Zhakov <chemodax@gmail.com> wrote:
> Hi!
>
> There is test for issue 2135.
>
> [[
> Add test for issue 2135 (bug in reverse merge when replacing a file)
>
> * subversion/tests/clients/cmdline/merge_tests.py
> (merge_file_replace): New test for issue 2135.
> (test_list): Add merge_file_replace test and mark it with XFail.
> ]]

I've tested and reviewed the patch - but the latter without a working
copy handy.

The patch works, but, could you please use run_and_verify_update
instead of run_and_verify_svn with an "up" command argument? That way
the test assures the right pre-condition for the merge command you run
after that. There is no run_and_verify_merge, is there? (If there is,
please use that too instead of run_and_verify_svn...)

Great work! I'll update the wc-replacements branch this week with the
latest of trunk commits.

bye,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 2 10:07:43 2005