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

Re: [PATCH] v6 Fix #3390 Relative externals not updated during switch

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Wed, 30 Dec 2009 07:45:12 +0100

On Mon, Dec 28, 2009 at 04:33:21PM +0000, Stefan Sperling wrote:
> > On Mon, Dec 28, 2009 at 03:36:46PM +0100, Daniel Näslund wrote:
> > + /* If we're doing an 'svn export' the current dir will not be a
> > + working copy. We can't get the parent_dir. */
> > + if (err && err->apr_err == SVN_ERR_WC_NOT_WORKING_COPY)
> > + {
> > + if (err->apr_err == SVN_ERR_WC_NOT_WORKING_COPY)
> > + {
>
> You don't need to check err->apr_err twice.

Gah! I really must be more careful with what I send away.

[[[
Fix issue #3390, relative externals not updated during switch. As a side
effect - allow externals hash diff functionality to be used with abspaths.

* subversion/libsvn_client/switch.c
  (svn_client__switch_internal): Pass in an external_func to
    svn_wc_crawl_revision5().

* subversion/libsvn_client/externals.c
  (handle_externals_desc_change): Get the url for parent_dir with
    svn_wc__node_get_url(). Does not work for export where the
    parent_dir has no url. Then we resort to the old way of adding the
    parent_dir to the from_url.

* subversion/tests/cmdline/externals_tests.py
  (test_list): Remove XFail from switch_relative_external.

Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>
Review by: stsp, philip
]]]

Daniel

Received on 2009-12-30 07:45:56 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.