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

Re: svn commit: r23746 - in trunk/subversion: libsvn_client libsvn_wc tests/cmdline

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: 2007-03-10 21:18:49 CET

Lieven Govaerts wrote:
> Hyrum K. Wright wrote:
>> Lieven Govaerts wrote:
>>
>>> Hyrum,
>>>
>>>
>>> this is the output of the test on Windows:
>>>
>> Thanks. I'll look at it this weekend. I actually suspect that it's a
>> problem with the test.
>>
> I don't think the test is correct, not only in syntax, it also doesn't
> test the feature you've implemented AFAIC.
>
> Attached is a patch for what I think is a good test. What it does is
> remove the 'H' directory in r 6, and then checking out H@4 using
> externals. Unfortunately this test fails with only the peg rev, unless I
> also add the operative rev in the externals definition.

Lieven,
Thanks for taking a look at this! The patch looks good, except for one
thing, which I've noted below. This passes on my Ubuntu 6.10 system.

-Hyrum

>
> ------------------------------------------------------------------------
>
> Index: subversion/tests/cmdline/externals_tests.py
> ===================================================================
> --- subversion/tests/cmdline/externals_tests.py (revision 23757)
> +++ subversion/tests/cmdline/externals_tests.py (working copy)
> @@ -722,7 +722,7 @@
>
> externals_test_setup(sbox)
> wc_dir = sbox.wc_dir
> -
> +
> repo_dir = sbox.repo_dir
> repo_url = sbox.repo_url
> other_repo_url = repo_url + ".other"
> @@ -734,10 +734,13 @@
> '--password', svntest.main.wc_passwd,
> repo_url, wc_dir)
>
> + # remove A/D/H in the other repo
> + svntest.actions.run_and_verify_svn(None, None, [], 'rm', other_repo_url + '/A/D/H', '-m', 'remove original A/D/H')
> +
> # Set an external property using peg revision syntax.
> new_externals_desc = \
> - " -r 1 " + other_repo_url + "/A/D/H@4 exdir_A/H \n" + \
> - other_repo_url + "/A/D/G exdir_A/G \n"
> + "exdir_A/H " + other_repo_url + "/A/D/H@4\n" + \

This should use the new ordering to expose the peg revision syntax:
other_repo_url + "/A/D/H@4 exdir_A/H\n" + \

> + "exdir_A/G " + other_repo_url + "/A/D/G\n"
>
> # Set and commit the property.
> change_external(os.path.join(wc_dir, "A/D"), new_externals_desc)

Received on Sat Mar 10 21:19:35 2007

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