[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: MJF <m.smith_at_comvision.net.au>
Date: Fri, 18 Jul 2008 00:46:17 -0700 (PDT)

I forgot to mention I don't want to merge because the main trunk code
is now completely different to the branch I merged from. The software
project communicates with hardware device and there was a change of
communication methology due to a new model of the device being used -
the two branches are totally different. The bug I fixed only relates
to the original hardware, and does not apply to the current hardware.


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 ?
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org

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 09:46:45 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.