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

Re: svn commit: r33396 - trunk/subversion/tests/libsvn_subr

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Thu, 2 Oct 2008 20:28:42 +0300 (Jerusalem Daylight Time)

lgo_at_tigris.org wrote on Thu, 2 Oct 2008 at 07:57 -0700:
> Author: lgo
> Date: Thu Oct 2 07:57:22 2008
> New Revision: 33396
>
> Log:
> Manually merged the remaining part of r33211 from the windows_dirents branch
> to trunk.
>

...which finishes the windows_dirents work. Thanks!

> * subversion/tests/libsvn_subr/dirent_uri-test.c
> (svn_dirent_is_absolute): Add some testcases.
                   ^
s/absolute/ancestor/

But more importantly, r33211 also made copy_tests 74 pass on Windows.
(The test is XFail on trunk, but passes on the branch. My fault for not
making this clearer at the time I committed the fix.) I think the
proper fix now is just:

    Index: subversion/libsvn_wc/copy.c
    ===================================================================
    --- subversion/libsvn_wc/copy.c (revision 33373)
    +++ subversion/libsvn_wc/copy.c (working copy)
    @@ -334,8 +334,8 @@ get_copyfrom_url_rev_via_parent(const char *src_pa
     
           /* Don't look for parent_path in src_access if it can't be
              there... */
    - if (svn_path_is_ancestor(svn_wc_adm_access_path(src_access),
    - parent_path))
    + if (svn_dirent_is_ancestor(svn_wc_adm_access_path(src_access),
    + parent_path))
             {
               SVN_ERR(svn_wc_adm_retrieve(&parent_access, src_access,
                                           parent_path, pool));

but I don't have time to look further now. (I'll commit it myself in a
few days, if I'm not beaten to it.)

Daniel

>
> Modified:
> trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
>
> Modified: trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c?pathrev=33396&r1=33395&r2=33396
> ==============================================================================
> --- trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Thu Oct 2 07:49:09 2008 (r33395)
> +++ trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Thu Oct 2 07:57:22 2008 (r33396)
> @@ -773,8 +773,10 @@ test_dirent_is_ancestor(const char **msg
> { "X:/foo", "X:/", FALSE},
> { "X:/", "X:/foo", TRUE},
> { "X:", "X:foo", TRUE},
> + { SVN_EMPTY_PATH, "C:/", FALSE},
> #else /* WIN32 or Cygwin */
> { "X:", "X:foo", FALSE},
> + { SVN_EMPTY_PATH, "C:/", TRUE},
> #endif /* non-WIN32 */
> };

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-02 19:29:06 CEST

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