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

Re: svn commit: r32897 - trunk/subversion/libsvn_client

From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta_at_gmail.com>
Date: Fri, 5 Sep 2008 00:14:26 +0200

2008-09-04 16:50:19 blair_at_tigris.org napisaƂ(a):
> Author: blair
> Date: Thu Sep 4 07:50:19 2008
> New Revision: 32897
>
> Log:
> Fix some inconsistencies with svn:externals handling.
>
> 1) Removing an external or a file in a directory external and running
> 'svn update' will restore the external itself or an item in the
> external, however, 'svn switch' will not using the same URL.
>
> 2) compare_external_items() should not compare externals as identical
> if either one uses a HEAD peg revision, since a commit may have
> replaced the item with another one.
>
> Also see http://svn.haxx.se/dev/archive-2008-08/0714.shtml .
>
> The amazing thing about this patch is that it removes code from svn_wc :)

s/svn_wc/svn_client/

> * subversion/libsvn_client/client.h
> (svn_client__compare_revisions):
> Remove.
> (svn_client__handle_externals):
> Remove the update_unchanged argument.
>
> * subversion/libsvn_client/revisions.c
> (svn_client__compare_revisions):
> Remove.
>
> * subversion/libsvn_client/switch.c
> (svn_client__switch_internal):
> No longer pass FALSE to svn_client__handle_externals() as the
> update_unchanged argument.
>
> * subversion/libsvn_client/update.c
> (svn_client__update_internal):
> No longer pass FALSE to svn_client__handle_externals() as the
> update_unchanged argument.
>
> * subversion/libsvn_client/externals.c
> (struct handle_external_item_change_baton):
> Remove the update_unchanged field.
> (struct handle_externals_desc_change_baton):
> Remove the update_unchanged field.
> (compare_external_items):
> Remove.
> (handle_external_item_change):
> Always update the external.
> (handle_externals_desc_change):
> Do not copy the update_unchanged field from the
> handle_externals_desc_change_baton to the
> handle_external_item_change_baton.
> (svn_client__handle_externals):
> No longer take an update_unchanged argument.
>
> Modified:
> trunk/subversion/libsvn_client/client.h
> trunk/subversion/libsvn_client/externals.c
> trunk/subversion/libsvn_client/revisions.c
> trunk/subversion/libsvn_client/switch.c
> trunk/subversion/libsvn_client/update.c
>
> Modified: trunk/subversion/libsvn_client/externals.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/externals.c?pathrev=32897&r1=32896&r2=32897
> ==============================================================================
> --- trunk/subversion/libsvn_client/externals.c Thu Sep 4 06:44:20 2008 (r32896)
> +++ trunk/subversion/libsvn_client/externals.c Thu Sep 4 07:50:19 2008 (r32897)
> (...)
> @@ -883,7 +850,6 @@ svn_client__fetch_externals(apr_hash_t *
> cb.from_url = from_url;
> cb.to_path = to_path;
> cb.repos_root_url = repos_root_url;
> - cb.update_unchanged = TRUE;
> cb.timestamp_sleep = timestamp_sleep;
> cb.is_export = is_export;
> cb.pool = pool;

This change isn't documented in the log message.

-- 
Arfrever Frehtes Taifersar Arahesis

Received on 2008-09-05 00:19:25 CEST

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