Re: How to disable automatic merging...

> 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
>
Thanks. This is helpful. Still this is no better than forcing
conflicts (turning off merge) and then diff'ing the conflicted files,
which is what I think I'll do unless someone can make a convincing
argument againts.

In any case, if two developers make changes to the some file, a
*human* needs to evaluate those changes. Whether that's done before
the commit or after merging, the need is the same. Forcing the
conflict makes sure that the step is taken.

Thanks everyone for your help. I learned a few things, as I had hoped.
-GH

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 11 01:10:01 2007