Look for conflicts

[ta...@transdata.net]

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

RE: Look for conflicts

[Ed MacDonald <ed...@hotmail.com>]

In TortoiseSVN, the obscurely named menu item "Check for Modifications"
brings up a window listing <insert drum roll> all files in your working copy
that have been modified since check out.  At the bottom of that dialog is a
button labeled "Check Repository".  Guess what that does.

(I'm feeling a little cheeky today, but at least you got answered :)


-----Original Message-----
From: tappe@transdata.net [mailto:tappe@transdata.net] 
Sent: Wednesday, March 02, 2005 5:34 AM
To: users@subversion.tigris.org
Subject: 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


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org