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

Re: How to return from a branch

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Fri, 18 Jul 2008 10:33:50 +0100

2008/7/18 MJF <m.smith_at_comvision.net.au>:
> I just foud the "Switch..." option...is this the method to use ?
>
> Mal
>
> On Jul 18, 5:35 pm, MJF <m.sm..._at_comvision.net.au> wrote:
>> I'm not sure what I'm doing so want to ask here. Please advise.
>>
>> I had a main trunk with revisions leading up to #1116
>>
>> I was asked to correct a problem in an earlier version, so I branched
>> from revision #291. After making the changes and committing, I end up
>> with this graph:
>>
>> trunk: 65 -> 291 -> 1116
>> |
>> branches: + 1120 -> 1121
>>
>> I'm happy with 1121 and want to leave it there (or tag it I suppose, I
>> don't know)
>>
>> But I want to revert back to 1116 in my working copy and make it the
>> new HEAD so future commits are added to the main trunk.
>>
>> I'm not sure how to do this and am to frightened to do it without
>> asking in case I make a mess that I cannot recover from.
>>
>> What are the steps required ? Thanks in advance.
>>
>> (I did search but everything refers to merging back to the main trunk
>> - I don't want to do this). Did I do it wrong from the start ?

It's not exactly clear what you did, but this is my guess.

1. You created a branch from r291 and checked the box to switch to the
new branch, so your working copy reflected the new branch.
2. You fixed the bug and committed on the branch.
3. You want to leave the branch as-is and bring your working copy back
to the HEAD of trunk.

If this is the case, then yes 'Switch' is exactly what you want. It is
used to change a working copy from one branch to another.

Simon

-- 
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-18 11:34:02 CEST

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