On Wed, 2008-12-10 at 10:35 -0800, Paul T. Burba wrote:
> Author: pburba
> Date: Wed Dec 10 10:35:28 2008
> New Revision: 34654
>
> Log:
> Fix merge test XFailing since the tree-conflicts branch was merged to trunk.
Thank you very much, Paul!
> The behavior here was correct, it was just the test expectations that were
> wrong.
>
> * subversion/tests/cmdline/merge_tests.py
> (mergeinfo_recording_in_skipped_merge): Follow-up to r31326 on the
> tree-conflicts branch, we expect a *tree* conflict to be reported on the
> locally deleted subtree, not a regular conflict that subtree's parent - see
> http://svn.collab.net/repos/svn/trunk/notes/tree-conflicts/detection.txt,
> where it always the locally deleted subtree, not its parent, that is the
> tree conflict victim. Also, since this test now produces a tree conflict,
> we don't expect any skip notification, but we do expect the tree conflict
> in the status. This test covers now covers a use case quite similar to
> tree_conflicts_on_merge_local_ci_4_1, but there is no harm in leaving it
> in.
> (test_list): Remove XFail from mergeinfo_recording_in_skipped_merge.
I wonder if it would be good to change the test's name and/or
description to not say "... in skipped merge".
- Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=982620
Received on 2008-12-11 01:27:05 CET