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

Re: [TSVN] Revision ranges when merging

From: Klaus Drechsler <drechsler_at_gmx.net>
Date: 2005-08-26 15:28:37 CEST

> Consider a frequent use case, where you want to merge the changes from
> one revision on trunk into a branch (eg. merge a trunk bugfix into a
> stable release branch).
>
> 1. Show log for trunk.
> 2. Select the single revision you are interested in (say r123)
> 3. TSVN fills in the boxes as 122:123

For me this case is very intuitive, because TSVN does the "thinkink" for me.
I just say "merge r123" and what TSVN has to do to do it right does not
interest me. It just works.

But in my branching example. I want to do something, and TSVN does not let
me do it. In this example I must think for TSVN that I have to select r39
(and not r38 like on the command line, or as written in the book), so that
TSVN does merging right. That is not nice...

When TSVN does something that makes life easier for me, than I consider it
an intuitive feature. But when I have to think twice to use a feature right,
than it in not intuitive. Than it is confusing.

> > And because the command line tool works with x1 and x2 it is even more
> > intuitive to use x1 and x2 in TSVN.
>
> There are lots of places where TSVN is not identical to the command
> line. For example if you right click in the Show Log dialog you will see
> entries like 'Show differences as unified diff'.

See above. This is what I call intuitve feature. It makes my life easier.

> I am surprised the merge worked at all because the branch did not exist
> in r37. Normally doing that will throw an error message. You had your
> working copy on trunk, and you merged the branch revisions from the
> repository into your trunk WC?

Yes, my working copy was on trunk. Then I selected from r38 (in the "show
log", which TSVN converted to r37) to "HEAD".

Everything worked fine. No error messeges. I am using TSVN 4254 and SVN
1.2.1.

> When it was identical to the CLI, a lot of people complained that it was
> confusing too. It's hard to please everyone :-(

Maybe you should consider to have more than one menu entry (in the context
menu) for merging, like "merge branch", "merge single revision", "merge
range" or something like that. And according to the menu entry I choose for
merging, you could handle the revisions I select in "show log" differently.
IMHO this would make things much clearer.

Greetings,
 Klaus

-- 
GMX DSL = Maximale Leistung zum minimalen Preis!
2000 MB nur 2,99, Flatrate ab 4,99 Euro/Monat: http://www.gmx.net/de/go/dsl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 26 15:28:59 2005

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