Re: How to disable automatic merging...

> Before you issue an 'svn up', you can always do the following to look
> first at what changes have occurred between your local wc and server :
>
> svn status -u -v PATH
>
> Then you can use
>
> svn diff ...

Thanks, that helps.

All the same, I can do essentially the same procedure, with no more
work really, by forcing SVN to have a conflict if two or more users
changed one file and then diff'ing the conflicted files. And having
the conflict guarantees that I don't accidentally commit a merged file
(that SVN may have merged incorrectly since only humans can really
merge...)

Again though thanks. The -u will be helpful...

Best,
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:01:21 2007