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

[TSVN] Re: TortoiseMerge bug & feature request

From: Jens Scheidtmann <Jens.Scheidtmann_at_bayerbbs.com>
Date: 2004-09-06 08:20:59 CEST

dev-return-7811-jens.scheidtmann=bayerbbs.com@tortoisesvn.tigris.org writes:

> "SteveKing" wrote:
> > Simon Large wrote
[...]
> > 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.

Does it complain, even if you removed one file from the
selection in the commit dialog?

Just curious,

Jens

-- 
Jens.Scheidtmann@bayerbbs.com
---------------------------------------------------------------------
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:34 2004

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