Reviewing merged changes

[Tim Armes <ta...@fr.imaje.com>]

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

Re: Reviewing merged changes

[Lele Gaifax <le...@nautilus.homeip.net>]

>>>>> "Tim" == Tim Armes <ta...@fr.imaje.com> writes:

    Tim> Hi,

    Tim> Is there way to see the changes that are automatically merged
    Tim> into a file during an svn update?

Sometimes it would be cool having an option to get the diffs dumped on
stdout too while update/merge takes action, when applicable. I know
this is actually "svn diff; svn update", but maybe it's easy (*) to
introduce such a shortcut...

ciao, lele.

(*) and "right", given that there is no guarantee that the same diffs
    will be applied, given the time>0 between the diff and the update
    that allows other transactions to take place.
-- 
nickname: Lele Gaifax	| Quando vivrò di quello che ho pensato ieri
real: Emanuele Gaifas	| comincerò ad aver paura di chi mi copia.
email: lele@seldati.it	|		-- Fortunato Depero, 1929.


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Reviewing merged changes

["C. Michael Pilato" <cm...@collab.net>]

Tim Armes <ta...@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

Re: Reviewing merged changes

[John Peacock <jp...@rowman.com>]

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

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