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

Re: [PATCH] Extension to merge test 78 (in issue-2897 branch)

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-12-17 12:44:12 CET

Thanks Senthil.

See comments inline, after addressing them, +1 to commit.

Senthil Kumaran S wrote:
> Hi,
>
> I am attaching a patch along with this email which will extend merge
> test 78 in issue-2897 branch, to have two trunk sync ups in the
> feature branch before we test for non-reflective text changes.
>
> [[[
> On the issue-2897 branch, Extend merge test 78
>
> Extend merge test 78 to have two sync ups from trunk to the feature
> branch before we test for non-reflective text change.
It should be,

Extend merge test 78 to have two *non-contiguous range* merges from
trunk to the feature branch.

>
> * subversion/tests/cmdline/merge_tests.py
> (merge_non_reflective_text_change): Introduce two sync ups from trunk
> to the feature branch
Introduce two *non-contiguous range* merges from trunk to the feature
branch.

Comments about the patch.

In the last merge i.e
+ # Merge /A/B/E_COPY to /A/B/E ie., feature branch back to trunk
   expected_output = wc.State(short_ABE, {
     '' : Item(status=' U'),
- 'alpha' : Item(status='G '),
+ 'alpha' : Item(status='U '),

This should remain as 'G' as 'single *reflective* merge drive can happen
over multiple reflected ranges'.

Immediate 'expected_status' should have 'wc_rev' set to '7'.

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 Mon Dec 17 12:47:52 2007

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