Hi,
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.
Since the update's succeeded, it's also impossible to retrieve the revision
number on which the modifications were carried out. If this were available
then you could simply compare the head revision of the given file to the
revision which you'd been working on to see the changes that you've
effectively merged.
It's difficult to have confidence in the merge when you can't see what's
actually been merged. The fact the that modifications aren't on the same
line doesn't mean that the don't interfere with each other. Not every
project has a test suite that can be run before doing a commit to ensure
that nothing's been broken.
Tim
###########################################
This message has been scanned by F-Secure Anti-Virus for Microsoft Exchange.
For more information, connect to http://www.F-Secure.com/
---------------------------------------------------------------------
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:24:25 2004