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

Re: Feature Request for Merge related functions

From: Sven Brueggemann <SBrueggemann_at_gmx.net>
Date: 2006-07-10 22:56:53 CEST

Mark Pickersgill wrote:

> - Add a "Diff with..." or "Compare with..." context menu option
> Reason/Usefulness: Useful for quickly comparing a full file that has
> been sent to you, rather than having to commit it to the repository
> to diff the changes or try and invoke another merge tool. Also useful
> for easily comparing changes between say trunk and a branch version
> of a file or folder.

When I'm sent files, I usually copy them to a seperate working copy
to do diffing, tweaking and finally committing. If you want to
compare a file in a WC with a different URL and/or revision than the
one the WC points to, you can hold down the shift key when requesting
the context menu and choose "Diff with URL".
Regarding trunk/branch compares: You can select both versions of
the file in the revision graph and select "Compare Revisions" in the
context menu.

> - If you right click on a folder under subversion control and select
> "Merge..." it would be nice if it filled out the "From" url with the
> selected file/folder as other TortoiseSVN dialogs "tend" to do.

This is configurable via 'Use URL of WC as the default "From:" URL'.
In 1.4.0 it's under Look&Feel/Dialogs 1. I think it has moved
since 1.3.x, but it should be there anywhere.

Just a few pointers. I agree with you that there can't be enough
diffing functions and for complex merges an improved preview would be
nice to have.

Kind regards

Sven

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jul 10 22:56:58 2006

This is an archived mail posted to the TortoiseSVN Dev mailing list.