Look for conflicts

As a newbie to subversion (and tortoisesvn) I would like to ask:

If I have a large amount of files to be commited to the repository and I get
some conflict error, I would like to ask for a list of files that have been
changed in the repository in the meantime and were modified locally.

Is the following command the right (best?) way to get this info:

svn status -u | grep "^M.* \* .*"

(status output has "M" flag for locally modified files and an asterisk for a newer revision in the repository)

And (a bit OFFTOPIC, sorry for that) is there a way to get this info via TortoiseSVN?

--Heiko

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 2 16:50:50 2005