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

Re: svn commit: r35338 - trunk/subversion/tests/cmdline

From: Greg Stein <gstein_at_gmail.com>
Date: Wed, 21 Jan 2009 09:38:47 +0100

Maybe leave a description of why it fails within the script itself,
rather than externally? (in the issue)

On Mon, Jan 19, 2009 at 23:14, Paul T. Burba <pburba_at_collab.net> wrote:
> Author: pburba
> Date: Mon Jan 19 14:14:44 2009
> New Revision: 35338
>
> Log:
> Fix some incorrect expectations for XFailing merge test for issue #2690.
>
> * subversion/tests/cmdline/merge_tests.py
> (merge_dir_and_file_replace): Account for mergeinfo and correct expected
> output from a merge. This test still fails, but not fails as described
> in issue #2690.
>
> Modified:
> trunk/subversion/tests/cmdline/merge_tests.py
>
> Modified: trunk/subversion/tests/cmdline/merge_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/merge_tests.py?pathrev=35338&r1=35337&r2=35338
> ==============================================================================
> --- trunk/subversion/tests/cmdline/merge_tests.py Mon Jan 19 13:49:51 2009 (r35337)
> +++ trunk/subversion/tests/cmdline/merge_tests.py Mon Jan 19 14:14:44 2009 (r35338)
> @@ -2749,19 +2749,17 @@ def merge_dir_and_file_replace(sbox):
> 'A/C/foo/new file' : Item(status=' ', wc_rev=3),
> 'A/C/foo/new file 2' : Item(status=' ', wc_rev=3),
> })
> + expected_status.tweak('A/C', wc_rev=3) # From mergeinfo
> svntest.actions.run_and_verify_commit(wc_dir,
> expected_output,
> expected_status,
> None, wc_dir)
> # Merge replacement of foo onto C
> expected_output = wc.State(C_path, {
> - 'foo' : Item(status='D '),
> - 'foo' : Item(status='A '),
> - 'foo/new file 2' : Item(status='D '),
> - 'foo/new file 2' : Item(status='A '),
> - 'foo/bar' : Item(status='A '),
> + 'foo' : Item(status='R '),
> + 'foo/new file 2' : Item(status='A '),
> + 'foo/bar' : Item(status='A '),
> 'foo/bar/new file 3' : Item(status='A '),
> - 'foo/new file' : Item(status='D '),
> })
> expected_disk = wc.State('', {
> '' : Item(props={SVN_PROP_MERGEINFO : '/A/B/F:2-5'}),
> @@ -2771,7 +2769,7 @@ def merge_dir_and_file_replace(sbox):
> 'foo/bar/new file 3' : Item("Initial text in new file 3.\n"),
> })
> expected_status = wc.State(C_path, {
> - '' : Item(status=' ', wc_rev=1),
> + '' : Item(status=' M', wc_rev=3),
> 'foo' : Item(status='R ', wc_rev='-', copied='+'),
> 'foo/new file 2' : Item(status='R ', wc_rev='-', copied='+'),
> 'foo/bar' : Item(status='A ', wc_rev='-', copied='+'),
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1035766
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1040687
Received on 2009-01-21 09:41:04 CET

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