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

Re: svn, Windows and conflicts

From: Bruce Webber <brucewebber_at_fastmail.us>
Date: 2005-12-10 20:40:24 CET

> Ron wrote:
>> Is there a way to make the Windows version of svn complain louder if
>> there is a conflict?
>>
>> Just showing:
>>
>> C MyFile.txt
>>
>> can slip by too easy with a large number of files. Unless I am doing
>> something wrong, there is no ERROR return from svn that says there was a
>> conflict.
>>
>> I can't see to find any options for being more verbose on conflict.
>> Under UNIX, I would have a script that check for these, but a Window
>> batch file is just not that swift.
>>
>> Thanks, Ron

--Phillip Susi <psusi@cfl.rr.com> wrote:

> Maybe you should try using tortoisesvn on windows? Other than that, I
> don't see why it is so hard to see the C status when you run an svn
> status from the command line. Also if you try to commit with conflicts,
> you will get an error.

You can have a Windows batch file take the output from svn up and redirects
it to a file, then run the find command and look for "C" followed by
spaces. It would like this (I haven't tested this, you may have to make
adjustments).

svn up > svnresults.txt
type svnresults.txt
echo -----
find "C " svnresults.txt

Not as nice as *nix, but still workable. If you put this batch file in your
search path, it should apply to the current directory.

--
Bruce Webber
brucewebber@fastmail.us
http://brucewebber.us
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Dec 10 20:40:11 2005

This is an archived mail posted to the Subversion Users mailing list.