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

[TSVN] Getting confused with feature branch merge

From: Robin <darkaurora_at_yahoo.com>
Date: 2005-09-01 14:32:06 CEST


I'm doing a test repository to simulate merging branch with TSVN 1.2.3,
and I'm getting very confused with merging two different trees. My
repository commit log so far looks like

Trunk Branch

                  Rev 24
Rev 23
                  Rev 22
Rev 21
                  Rev 20 - Merged from trunk
Rev 19
Rev 18
                  Rev 17
                  Rev 16
                  Rev 15 - Merged from trunk
Rev 14
Rev 13
                  Rev 12 - Created branch
Rev 11

Now I want to merge the branch back into trunk. From the TSVN help file
section 5.17.2
"In both the From Revision field and the To Revision field, enter the
last revision number at which the two trees were synchronized"

So I should merge with like this (in TSVN)

  Result: Trunk
  To: Trunk Rev: 20
  From: Branch Rev:20

But the merge didn't get Rev 22 and Rev 24. So I finally got it working

 Result: Trunk
 To: Trunk Rev: 20
 From: Branch Rev: 24

So now I think, I should specify the starting sync location at trunk,
and where I want to sync to at branch. So when I add more commits, and
I want to merge the branch back into the trunk again, this logic fails.
Now my repository looks like

Trunk Branch
                        Rev 29
                        Rev 28
Rev 27
Rev 26
Rev 25 Merge from branch

Now if I try to apply the same logic, I should use

 Result: Trunk
 To: Trunk Rev: 25
 From: Branch Rev: 29

Unfortunately, it doesn't work. So I'm now very confused on the merge.
Anyknow can point me where I'm doing wrong?

Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Sep 1 15:10:59 2005

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