On Wed, 29 Nov 2006, Kamesh Jayachandran wrote:
> We need not update 'wc' to r3.
> I did it originally as it was easier to create expected_status outside
> As create_deep_trees return 'expected_status' we need not update the
> 'WC' to r3.
> (I am in favour of it as it looks clean to caller, not in favour of it
> as it is unnecessary.)
Okay. I've committed the patch to the branch in r22507.
I removed the update of the WC to r3 in create_deep_trees(), and
adjusted the callers accordingly. Not performing the update in that
helper function makes the tests run slightly faster and requires less
> Daniel Rall wrote:
> >On Tue, 28 Nov 2006, Kamesh Jayachandran wrote:
> >>If merge target's subtree has merge avoid repeated merge by taking in to
> >>account what is already merged.
> >>* subversion/tests/cmdline/merge_tests.py
> >> (create_deep_trees):
> >> New function with a code borrowed from
> >> 'avoid_repeated_merge_using_inherited_merge_info' to reuse from the
> >> new
> >> Testcase.
> >> (avoid_repeated_merge_using_inherited_merge_info):
> >> Changes in effect of new 'create_deep_trees'.
> >> (avoid_repeated_merge_on_subtree_having_merge_info):
> >> New function for the Testcase mentioned in the summary.
> >> (test_list):
> >> Include 'avoid_repeated_merge_on_subtree_having_merge_info' as XFail.
> >Kamesh, this is a great start! I'm attaching a smaller, revised patch
> >which reduces the redundancy and the delta. There may be more
> >redundancy that we can factor out as well. Also, the inline comments
> >in the new test case should be more clear.
Received on Wed Nov 29 23:29:42 2006
- application/pgp-signature attachment: stored