[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:53:27 CEST

> With TSVN all you need do is simply nominate the start and end revision
> that *contain changes you want to be merged from* whether that be just
> one to dozens and bingo, it happens.
> It's easier to explain to new users and much safer than having them do
> maths and get it wrong.

You are right. It is easier to select revisions that contain changes I would
like to merge.

But in the branching example I have the following:

I have a branch starting at rX and I want to merge it to the trunk. So
intuitivly I want to say "merge the branch starting at rX to HEAD with my
trunk".

The tasks I have to think about:
1. I want to merge the branch to the trunk
2. My branch starts at r38, so I select it
4. select HEAD

Right now it is like this:
1. I want to merge the branch to the trunk
2. My branch starts at 38
3. I must select r39, because TSVN decrements the revision by one
4. select HEAD

The first scenario is much mor intuitive to me.

But this is because I think terms of "beginnig of branches". I want to merge
from the beginnig to the end.
When I would think in terms of "beginning of changes", than you are
absolutly right. Then I would select r39 intuitivly, because r39 contains
the changes.

Greetings,
 Klaus

-- 
5 GB Mailbox, 50 FreeSMS http://www.gmx.net/de/go/promail
+++ GMX - die erste Adresse für Mail, Message, More +++
---------------------------------------------------------------------
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:53:56 2005

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