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

Re: Tree conflicts on unversioned items?

From: Greg Stein <gstein_at_gmail.com>
Date: Thu, 16 Oct 2008 06:57:20 -0700

Right. I think it is a tree conflict because svn can't delete the
directory -- there are mods or unversioned items in there. Since it
can't complete the deletion, I think it should just leave it untouched
and mark it as conflicted.

On Thu, Oct 16, 2008 at 6:19 AM, Erik Huelsmann <ehuels_at_gmail.com> wrote:
> When an update/switch tries to delete a file or directory with local
> modifications, or - in case of a directory - with unversioned files in
> it, currently Subversion will report it 'leaves behind an unversioned
> item' in the working copy.
>
> Greg and I were talking just now that this may be considered a tree
> conflict too. Have you thought about these cases? Especially the
> directory case seems interesting.
>
> Bye,
>
>
> Erik.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org
>
>

---------------------------------------------------------------------
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-16 15:57:34 CEST

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