Re: How to disable automatic merging...

On 2007-12-10 15:40-0700, Gus Hart wrote:
>If there was an easy way to see those changes before committing
>myself, making sure they are OK are changing them if need be, then my
>desire to "turn off" automerging would not be as strong...(but you
>still have to be careful that you don't "miss" a merged file. With
>lots of files being updated, sometimes it's easy to miss the fact that
>one was merged...)

You can use "svn diff", but note the -r option:

     svn diff -r HEAD some_file.py

or simply do this to see everything on the server that is different from your
working copy:

     svn diff -r HEAD

-- 
  Noah Spurrier | email: noah_at_noah.org | http://www.noah.org/wiki/engineering 
-------------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org