Re: Reviewing merged changes

Tim Armes <tarmes@fr.imaje.com> writes:

> Is there way to see the changes that are automatically merged into a
> file during an svn update? When a conflict occurs the temporary
> files allow the user to compare the lastest revision and the working
> copy revision to the base revision, however when the merge is
> automatic this doesn't happen.

You can run 'svn blame' on the file to see what lines changed, when.
But the information about the fact that you changed certain lines in
exactly the same way that someone else also did is lost. So (as you
know) only lines that you've changed and that were *not* merged will
show up in 'svn diff'.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 4 11:49:10 2004