Re: How to disable automatic merging...

On 12/10/07, Talden <talden@gmail.com> wrote:
...
> > it, great (I hope you're right). But if you don't, like me, then you
> > want to see the changes before committing your own.
>
> Which of course you do...
>
> If File X.java exists in the repo for which both Dev A and Dev B have
> working copies and the following occurs.
>
> Dev A modifies X.java, reviews the changes and commits
> Dev B modifies X.java, updates (getting a merge), reviews the
> changes and commits

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

-- 
Gus Hart
http://msg.byu.edu
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org