[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH][merge-tracking] XFail Testcase for 'avoid merge on subtree of a target if it has the same mergeinfo already'

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-11-29 23:28:15 CET

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
> create_deep_trees.
> 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
code.

- Dan

...
> 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.

  • application/pgp-signature attachment: stored
Received on Wed Nov 29 23:29:42 2006

This is an archived mail posted to the Subversion Dev mailing list.