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

[TSVN] Re: Re: TortoiseMerge bug & feature request

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-09-04 19:35:24 CEST

"SteveKing" wrote:
> Simon Large wrote
> > If I try to commit the directory, there is no clear indication that
there
> > are still conflicts. There is a big clue in that I get Test.c.mine,
> > Test.c.r5 and Test.c.r6 showing up in the unversioned files, but if the
> > ignore list is not set up so there are a lot of other unversioned files
you
> > might miss it. My directory is only 1 level deep so I can see the
conflict
> > overlay easily, but in a deep folder structure I would not. I don't know
if
> > it is easy for the commit dialog to detect that.
>
> The conflicted files should actually be shown in red!

In the commit dialog, no they are not in red. I see the conflict working
files as unversioned files, but the conflicting file itself is not there.
Maybe this is expected because it _can't_ be committed in its present state.
Maybe it should show up in red without a checkbox as an early warning, but
its not really worth spending dev time on it because ...

> And if you try to commit such a file, Subversion will throw an error too.

... yes it does, and it then tells me where the conflicting file is, so
everything works perfectly safely.

Simon.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 11 20:13:33 2004

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