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

Re: cmdline test help for relative url merge test

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2007-11-06 15:43:24 CET

"Troy Curtis Jr" <troycurtisjr@gmail.com> writes:

> Couldn't find node 'B2' in expected tree
> * Node name: B2
> Path: svn-test-work/working_copies/merge_tests-75/A/B2
> Contents: N/A (node is a directory)
> Properties: {}
> Attributes: {'status': ' ', 'wc_rev': '2'}
> Children: 3

> # Now do the merge with relative url
> expected_output = wc.State(wc_dir, {
> 'A/B2/lambda' : Item(status='U ', wc_rev=3),
> })
>
> expected_disk = svntest.main.greek_state.copy()

I think that creates a tree without B2.

> expected_disk.tweak('A/B2/lambda',
> contents=expected_disk.desc['A/B2/lambda'].contents
> + lambda_text)

So you need expected_disk.add here.

>
> expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
> expected_status.add({
> 'A/B2/lambda' : Item(status='M ', wc_rev=3),
> })

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 6 15:43:44 2007

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