Re: [PATCH] XFail test for Issue #2973

Alex,

Thanks for the patch.

Alexander Thomas wrote:
> A XFail testcase for self reverse merge.
>
> [[[
> Issue #2973.
>
Mention whether it is a defect fix for the issue or a testcase.
> * subversion/tests/cmdline/merge_tests.py
> (self_reverse_merge): New test for self reverse merge.
>
Mention about the change in test_list.

Mention 'Patch-by' line.
> ]]]]
>
> ------------------------------------------------------------------------
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

>+def self_reverse_merge(sbox):
>+ "self reverse merge on child"

The description is wrong. It should have been "revert a commit on a target".

>+ # Create expected status tree; all local revisions should be at 1,
>+ # but mu and rho should be at revision 2.

Spurious mention of 'rho'.

>+ # record dummy self mergeinfo to test the fact that self-reversal
should work
>+ # irrespective of mergeinfo.
>+ svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c', '1',
>+ '--record-only', sbox.repo_url,
wc_dir)

Post this you should fix 'expected_disk' and 'expected_status'

Addressed all the comments at r27518 and committed.

Thanks.

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 31 11:29:21 2007