[TSVN] Check for updates does not include files with an unresolved conflict

Hi,

If I do an update that causes a conflict (creating test.mine

test.r1 test.r5 files etc) and then I do a commit the file in question is not mentioned.

Also, if I do "check for updates" the file is again not listed.

Is this right? I understand that the conflict needs to be resolved,

but I've found it easy to accidentally not resolve

all conflicts and then get to the commit stage without ever being warned

the conflict is still out there. Our directory structure is too huge to use the "Indicate folders with changed contents" option.

I'm new to TortoiseSVN and SVN so I may have missed something (btw you've done a fantastic job all round on TortoiseSVN, we love it).

(My About box shows:

TortoiseSVN 1.0.8, Build 1430, UNICODE
Subversion 1.0.6, (r10360)
apr 0.9.5
apr-iconv 0.9.5
apr-utils 0.9.5
berkeley db 4.2.52
neon 0.24.7
OpenSSL 0.9.7d 17 Mar 2004
zlib 1.2.1)

---------------------------------
Find local movie times and trailers on Yahoo! Movies.
Received on Fri Aug 20 10:14:08 2004