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

Re: How to disable automatic merging...

From: eg <egoots_at_gmail.com>
Date: 2007-12-11 00:54:50 CET

Gus Hart wrote:
>
> Maybe I missed something fundamental about how to use SVN. If I work
> on a project, then 'svn up' before committing, in case someone else
> made changes at the same time, and I get a merged file, how do I see
> what SVN changed for me in that file?
>
> 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...)

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 ...

on the relevant changed files to see the actual differences.

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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.