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

Re: Tree conflicts display and revert (was Re: Spurious conflicted overlay)

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 19 Mar 2009 21:58:52 +0000

On Thu, Mar 19, 2009 at 09:55:17PM +0000, Stefan Sperling wrote:
> On Fri, Mar 20, 2009 at 12:46:04AM +0300, Konstantin Kolinko wrote:
> > 2009/3/20 Simon Large <simon.tortoisesvn_at_googlemail.com>:
> > > I think what happens is this:
> > > doc/source has the property svn:ignore=*
> > > The incorrect merge then tries to merge a load of stuff from doc/
> > > which of course does not exist, so is marked as missing with tree
> > > conflict. However, since everything in source is ignored, these
> > > conflicts are hidden. I would expect a conflict status to override an
> > > ignore and show up anyway.
> > >
> >
> > I agree with this explanation.
> >
> > So, it is bug in svn status, triggered by svn:ignore=*
> >
> >
> > It does not seem to be fatal, as no data are lost.
> >
> > Best regards,
> > Konstantin Kolinko
>
> Please file an issue pointing back to this thread in the archives.

Oh, and putting "tree-conflicts" in the keywords field would be nice!
I have a bookmark for those.

Stefan
Received on 2009-03-19 22:59:49 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.