[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 14:06:46 CEST

> > Who is wrong? The svn book, or TSVN?
> Neither. In TSVN you select the revisions you want to merge back into
> the trunk, and TSVN automatically decrements the start by 1 because
> merging requires a diff against the previous revision.

That TSVN automatically decrements the start by one is more than confusing.
When I want to merge revision x1 to x2 of a branch to the trunk, then it
would be most intuitive if I select x1 in the "show log" window and TSVN
would show me x1 in the input field. A normal user would not understand why
TSVN tries to change what the user has selected.
And because the command line tool works with x1 and x2 it is even more
intuitive to use x1 and x2 in TSVN.

> In TSVN you select the revisions you want included in the merge. r38 was
> the branch creation, so you don't actually need to merge it back into
> trunk, so in ShowLog you would select 39:BranchHead. TSVN decrements
> that by 1 and you end up with the same as the SVN book.

Hmm...then I have done a wrong merging :-(
Because I selected r38 (according to the book and the commandline client).
TSVN changed this to r37, so I thought that this is ok.
I merged 37:BranchHead instead of 39:BranchHead :-(

> We tried to make merging more intuitive for a GUI client by doing it
> this way, but people who are used to the command line client now
> sometimes find it confusing :-(

I would like to see this "intuitive" feature removed from TSVN and changed
to be compatible with the commandline tool.

I am evaluating TSVN for my company. Merging with Subversion isnīt that fun
(because of missing merge tracking and log messages are not shown in the
trunk after merging etc.), and such an "intuitive" feature makes merging
even harder. I use both, TSVN and the command line tool, and having two
different semantics for the same feature is really confusing.

Please change it in the name of love :-)))


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 14:07:02 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.