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

Re: Reviewing merged changes

From: John Peacock <jpeacock_at_rowman.com>
Date: 2004-02-04 12:33:06 CET

Tim Armes wrote:
> 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.


John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4720 Boston Way
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5747
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:33:04 2004

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.