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

Beginner question on merging trunk to branch

From: halfer <nabble.forums.ws_at_jondh.me.uk>
Date: Thu, 9 Apr 2009 10:44:07 -0700 (PDT)

Hi all, new poster here. (Let me start by apologising if you've seen this
question before; I have had a good search for branching/merging info, but
not found a great deal relating specifically to TSVN. Perhaps I need to
sharpen my google skills!).

Briefly, I have set up a test repo, which myself and colleagues have each
checked out. We've each made some changes, and committed them using TSVN.
I've merged each of these changes (with minor issues, which may be the
subject of a later question) into the trunk. For myself and two colleagues I
merged and committed individually, so there were three commits to the trunk.

This means that for each user, their w/c is missing two changesets. I am
rather hoping that we don't need to worry about revision numbers, since each
of us just want to "be brought up-to-date" with all changes in the trunk.
Accordingly, on my personal branch, I use the "Merge a range of revisions",
and specify the trunk in the URL section. I leave the "range to merge" bit
empty, in order to get all changes. Then I click Next, and, accepting all
the default settings, I try "Test merge".

The first thing wrong is that the trunk merge starts at r490, when my branch
was a copy of the trunk at r491. Should it not therefore start from r492? As
a result of this I get several "tree conflicts".

Also, this approach tries to apply the trunk changeset that I merged from my
own branch, resulting in another tree conflict. Should (T)SVN not realise
that the change came from my branch in the first place?

I am on the very latest TSVN, 1.6.0, with an unknown server version that has
been around for a year or so. TIA for your attention and, again, apologies
if this is a repeated question :-)

Jon

-- 
View this message in context: http://www.nabble.com/Beginner-question-on-merging-trunk-to-branch-tp22976033p22976033.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1616317
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-09 20:17:17 CEST

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