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

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

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-09-06 12:26:48 CEST

"Stefan Küng" wrote:
> > Tried that. I did an Update which gave me the conflict in the first
place.
> > If I do a check-for-updates after that, there are no more updates so I
just
> > get an empty box. My WC is right up-to-date, but it has a conflict which
I
> > have not resolved yet.
>
> An empty box? You did a "check for updates" and not an "upated" right?

Yes. I get a Changed Files window with column headings of
File, Text Status, Property Status, Remote Text Status, Remote Property
Status.

It shows me that I have changed another file, but not that I have a WC file
with unresolved conflict.

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:14:20 2004

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