>> 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.
>
>If you always merge to the WC, a simple 'svn diff' will show you what has
>changed. Only merging from URL to URL performs an autocommit.
After the merge, the svn diff only shows your local changes, since these are
the only differences with repect to the head revision. There's no way to
see the differences between the locally modified version after the merge and
the locally modified version before the merge.
Effectively, a "state" has been lost. There's no record of the local
modifications *before* the update. What happens if everything goes wrong
following the merge? It's impossible to revert to the premerged state.
This problem can be solved by working independantely on a branch, committing
the changes in the knowledge there that can be no other changes to the
branch, then merging them into the trunk. Unfortunately this also requires
more work and time from the developers and loses the simplicity of having
everyone working on the trunk.
I suppose you could simply copy the WC elsewhere before doing the update.
Yuck.
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 12:45:04 2004