[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: Mark Pickersgill <mpickers_at_tpg.com.au>
Date: 2006-07-11 00:35:36 CEST

Hi Sven,

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

The copying to another working copy is something I'd like the avoid, but
I suppose it's a livable work-around :).

The shift key trick sounds good, although it doesn't appear to work in
1.3.5. I might try the nightly 1.4.0 series and see what's in there.

> Regarding trunk/branch compares: You can select both versions of
> the file in the revision graph and select "Compare Revisions" in the
> context menu.

Yes, I'm aware of that functionality, but the point is it's cumbersome
and a little out of kilter with the many of the other common functions
that are invoked from the explorer shell. Why reselect the first url
when you've already got it in explorer.

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

Doh! I went looking for such an option as well. Thank you very much.

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

Indeed. Subversion's branching capabilities was one of the driving
forces for another version control system getting a look-in at work.
However, merges between different development branches often complex as
you suggest, and no matter how good the capabilities of the version
control are, you need the interface as easy and straight forward as
possible...because you've got plenty of other things to worry about when
merging :)

Thanks for the feedback.

Mark

>
> Kind regards
>
> Sven
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 11 00:35:47 2006

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