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

Re: [TSVN] Getting confused with feature branch merge

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-09-01 15:51:14 CEST

Robin wrote:
> 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"

First mistake - quote from TSVN help file:
"All trunk changes have been ported to the feature branch, week by week,
and now the feature is complete you want to merge it back into the trunk."

You seem to have missed out r21 and r23 on trunk, so by merging the
feature branch back, you will discard those trunk changes.

> So I should merge with like this (in TSVN)
>
> Result: Trunk
> To: Trunk Rev: 20
> From: Branch Rev:20

Second mistake - quote from TSVN help file:
"In the From: field enter the full folder url of the trunk."
This sounds wrong, but read the manual again to find out why it is
actually right. You have merged the other way around.

When you do the merge correctly, the trunk will be identical to the
branch. I suggest you re-read the merging section of the TSVN manual,
and also the merging section of the SVN book.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
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:51:11 2005

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