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

Re: svn commit: r1095130 - in /subversion/trunk/subversion: libsvn_client/client.h libsvn_client/externals.c libsvn_client/switch.c libsvn_client/update.c libsvn_wc/adm_crawler.c tests/cmdline/externals_tests.py

From: Greg Stein <gstein_at_gmail.com>
Date: Tue, 19 Apr 2011 13:10:24 -0400

Did you even run the externals_tests before committing this? Looks
like there is a failure there. On Windows.

On Tue, Apr 19, 2011 at 12:46, <rhuijben_at_apache.org> wrote:
> Author: rhuijben
> Date: Tue Apr 19 16:46:51 2011
> New Revision: 1095130
>
> URL: http://svn.apache.org/viewvc?rev=1095130&view=rev
> Log:
> Remove the 'apply svn:externals from added files' code we introduced during the
> development of Subversion 1.7.0.
>
> While nice to have in certain use cases like testing new externals
> (see issue #2267), this quick and dirty hack introduses issues like
> issue #3351, where externals are not properly removed.
>
> This patch brings us back to the original behavior of only applying the
> svn:externals as defined by the BASE tree (read: of committed nodes).
> Which fixes the original automatic (but until recently mostly hidden)
> removal of externals on update.
>
> The removal/relegation of externals was made more visible in r1095122,
> by updating the notification code.
>
> * subversion/libsvn_client/client.h
>  (svn_client__gather_externals_in_locally_added_dirs): Remove function.
>
> * subversion/libsvn_client/externals.c
>  (svn_client__gather_externals_in_locally_added_dirs): Remove function.
>
> * subversion/libsvn_client/switch.c
>  (switch_internal): Remove walk of the WORKING tree for externals.
>
> * subversion/libsvn_client/update.c
>  (update_internal): Remove walk of the WORKING tree for externals.
>
> * subversion/libsvn_wc/adm_crawler.c
>  (read_externals_info): Read the BASE properties, not the ACTUAL ones.
>  (report_revisions_and_depths): Only call read_externals_info when we know
>    that we have BASE props.
>
> * subversion/tests/cmdline/externals_tests.py
>  (modify_and_update_receive_new_external,
>   switch_relative_external,
>   relegate_external): Bring back to their old expectations by just
>     committing the svn:externals change before testing.
>
>  (update_external_on_locally_added_dir,
>   switch_external_on_locally_added_dir): Remove functions.
>
>  (test_list): Remove functions.
>
> Modified:
>    subversion/trunk/subversion/libsvn_client/client.h
>    subversion/trunk/subversion/libsvn_client/externals.c
>    subversion/trunk/subversion/libsvn_client/switch.c
>    subversion/trunk/subversion/libsvn_client/update.c
>    subversion/trunk/subversion/libsvn_wc/adm_crawler.c
>    subversion/trunk/subversion/tests/cmdline/externals_tests.py
>...
Received on 2011-04-19 19:10:59 CEST

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.