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

Re: Why does "update" treat an obstruction differently if adding without history?

From: Paul Burba <ptburba_at_gmail.com>
Date: Wed, 29 Oct 2008 09:57:09 -0400

On Wed, Oct 29, 2008 at 8:21 AM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> Can anyone explain this special handling of items scheduled for addition
> *without history*, in "svn update"'s "add file" code path?
>
> It seems to me that if a file to be added is obstructed by a file on
> disk, it wouldn't matter whether it's being added with or without
> history.
>
> subversion/libsvn_wc/update_editor.c
>
> ('kind' is the on-disk node kind.)
>
> [[[
> @@ -2541,8 +2540,6 @@ add_file(const char *path,
> /* When adding, there should be nothing with this name unless unversioned
> obstructions are permitted or the obstruction is scheduled for addition
> (or replacement) without history. */
> /* ### " or the obstruction is scheduled for addition
> without history." ??? */
> if (kind != svn_node_none)
> {
> if (eb->allow_unver_obstructions
> || (entry && ((entry->schedule == svn_wc_schedule_add
> || entry->schedule == svn_wc_schedule_replace))))
> {
> /* ### now detected as a tree conflict instead.
> if (entry && entry->copied)
> {
> return svn_error_createf(SVN_ERR_WC_OBSTRUCTED_UPDATE,
> NULL,
> _("Failed to add file '%s': a "
> "file of the same name is "
> "already scheduled for addition "
> "with history"),
> svn_path_local_style(fb->path,
> pool));
> }
> */
> ...
> ]]]
>
> - Julian

Julian,

That was related to a follow-up to the "takeover" functionality, and
was filed as issue #2593.

See also (the threads are many and a bit broken, but these are the key points):

Mark describes the problem: http://svn.haxx.se/dev/archive-2006-08/0336.shtml
Your thoughts: http://svn.haxx.se/dev/archive-2006-08/0718.shtml
My proposed patch: http://svn.haxx.se/dev/archive-2006-09/0362.shtml

Paul

---------------------------------------------------------------------
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-29 14:57:24 CET

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