[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: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 17 Oct 2008 00:36:55 +0100

On Thu, Oct 16, 2008 at 06:57:20AM -0700, Greg Stein wrote:
> 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.

For the record: I talked to Erik and Greg about this at the summit.

I agree that unversioned items should be treated as "local
modifications" of the ACTUAL tree. Since we flag a tree conflict
when asked to delete a locally modified item from WORKING, the
same could apply to ACTUAL without causing inconsistencies.

I'm using wc-ng terminology here even though the current code
does not use it, but I guess it serves well to get across what
I want to say :)

Stefan

> 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

---------------------------------------------------------------------
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-17 01:37:27 CEST

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