RE: svn commit: r891672 - in /subversion/trunk/subversion: libsvn_client/commit_util.c tests/cmdline/externals_tests.py

> -----Original Message-----
> From: stylesen_at_apache.org [mailto:stylesen_at_apache.org]
> Sent: donderdag 17 december 2009 13:31
> To: commits_at_subversion.apache.org
> Subject: svn commit: r891672 - in /subversion/trunk/subversion:
> libsvn_client/commit_util.c tests/cmdline/externals_tests.py
>
> Author: stylesen
> Date: Thu Dec 17 12:30:43 2009
> New Revision: 891672
>
> URL: http://svn.apache.org/viewvc?rev=891672&view=rev
> Log:
> Fix issue #3552.
>
> * subversion/libsvn_client/commit_util.c
> (harvest_committables): Do not commit a file externals during a
> copy.
>
> * subversion/tests/cmdline/externals_tests.py
> (wc_repos_file_externals): New test.
> (test_list): Add above test to the list.
>
> Modified:
> subversion/trunk/subversion/libsvn_client/commit_util.c
> subversion/trunk/subversion/tests/cmdline/externals_tests.py
>
> Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/co
> mmit_util.c?rev=891672&r1=891671&r2=891672&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
> +++ subversion/trunk/subversion/libsvn_client/commit_util.c Thu Dec 17
> 12:30:43 2009
> @@ -430,6 +430,9 @@
> svn_dirent_local_style(path, scratch_pool));
> }
>
> + if (entry->file_external_path && copy_mode)
> + return SVN_NO_ERROR;
> +

Side discussion:

This check is not easy to perform in WC-NG (e.g. not supported by the design).

A problem is that a node is only an external when you look at it from a certain parent. And another issue is that checking for the file externals definition leaves the question of what we should do with switched files? (This is almost the same thing in our implementation)

In some other cases we decided that it would be better to handle file externals and switched files as the same status, because the definition of a switched file is well defined. (We only define/implement externals in the client layer at this time. There is just a bit of storage in libsvn_wc reserved to support this client feature).

        Bert
Received on 2009-12-17 13:53:08 CET