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

[TSVN] Revision ranges when merging

From: Klaus Drechsler <drechsler_at_gmx.net>
Date: 2005-08-26 12:41:16 CEST

Hi,

I am a little bit confused again.
I have created a branch when my trunk was at revision 37.
The branch therefore has revision 38.

Some time later I want to merge the branch back to the trunk.
In the dialog (after I selected merge in the context menu) I have to enter
the From: and To: revisions.

When I select "show log" and select revision 38 and click on ok the input
field shows revision 37 (not 38).

My understanding for that is: revision 38 is created after the branch, so I
want to start before the branch, that is at revision 37.

But than the svn book is wrong. Here:
http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.commonuses.wholebr
is an example merging a whole branch to the trunk. And there the From:
revision is the revision after the branch was created (in my case above this
would be r38).

Who is wrong? The svn book, or TSVN?

Greeting,
 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 12:41:45 2005

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