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

RE: svn commit: r26594 - trunk/subversion/tests/cmdline

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-09-14 20:38:33 CEST

Thanks Vlad. Fixed both in r26600 and r26602.

With regards
Kamesh Jayachandran

-----Original Message-----
From: Vlad Georgescu [mailto:vgeorgescu@gmail.com]
Sent: Fri 9/14/2007 7:45 PM
To: dev@subversion.tigris.org; kameshj@tigris.org
Subject: Re: svn commit: r26594 - trunk/subversion/tests/cmdline
 
Hi,

kameshj@tigris.org wrote:
> Author: kameshj
> Date: Fri Sep 14 05:54:52 2007
> New Revision: 26594
>
> Log:
> XFail Testcase to prove bug #2897
>
> See http://subversion.tigris.org/issues/show_bug.cgi?id=2897
>
> * subversion/tests/cmdline/merge_tests.py
> (faulty_reflective_merges): New function.
> (test_list): Add 'faulty_reflective_merges' as XFail test.
>
> Patch by: Senthil Kumaran <senthil@collab.net>

Do we still need merge test 56 (avoid_reflected_revs)? This test is
more comprehensive than avoid_reflected_revs.

Also, I'm currently working on a fix for this issue, so I noticed a
couple of problems with the expected trees for the last merge:

> [...]
> +
> + # Merge 2:7 from A_COPY(feature branch) to A(trunk).
> + short_A_path = shorten_path_kludge(A_path)
> + expected_output = wc.State(short_A_path, {
> + '' : Item(status=' U'),
> + 'bfile2' : Item(status='A '),
> + 'bfile1' : Item(status='A '),
> + 'tfile2' : Item(status='A '),
> + 'tfile1' : Item(status='A '),
> + })

Here, tfile1 and tfile2 shouldn't be added, and '' shouldn't get any
property changes, because r6 (the revision in which the A->A_COPY merge
was committed) should not be merged back.

> + expected_disk = wc.State('', {
> + '' : Item(props={SVN_PROP_MERGE_INFO : '/A:3-5\n/A_COPY:6-7\n'}),

The expected mergeinfo for /A should be '/A_COPY:3-5,7'. The requested
range is 3-7, and we subtract r6.

-- 
Vlad
Received on Fri Sep 14 20:35:48 2007

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