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

Re: AW: Re: Set branch as trunk?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 21 Oct 2009 19:24:44 +0200

On 21.10.2009 15:23, Jan Wedel wrote:
> Simon, thanks for your reply.
> Hmm...maybe I forgot to say that I need some parts of r80 which I want
> to merge into the new trunk based on r70. In other words, I just don't
> want to loose r71-r80, I just don't want to keep them in trunk.

* Create a branch of trunk at head. That branch will be your where you
can keep the data you don't want to 'lose'. But that's not really
necessary since you could always go back to retrieve those changes.
* show the log for trunk, select the revisions you want to undo,
right-click, choose "revert these revisions".
* commit your working copy of trunk
* show the log of your branch, select the revisions you want to have on
the trunk, right-click, choose "merge revisions to..." and select your
wc of trunk.
* commit trunk


> -Jan
> -----Ursprüngliche Nachricht-----
> Von: Simon Large [mailto:simon.tortoisesvn_at_googlemail.com]
> Gesendet: Mittwoch, 21. Oktober 2009 14:29
> An: users_at_tortoisesvn.tigris.org
> Betreff: Re: Set branch as trunk?
> 2009/10/21 Jan Wedel<Jan.Wedel_at_ettex.de>:
>> I currently work on a project where I implemented some improvements
> that
>> unexpectedly turned out as the exact opposite.
>> Now, I want to go back a few revisions (Lets say HEAD is 80, and
> last
>> good revision is 70), create a branch, and use this new branch as
> the main
>> branch. Is there a simple approach for that problem?
>> My more complex solution would be to create two new branch from r70
> and move
>> the trunk to one of them and copy the the other into trunk. But Im
> not sure
>> if this would work...
> That would be a difficult way of solving a simple problem.
> Show log for trunk.
> Select the last good revision in the top pane (r70)
> Right click and 'Revert to this revision'
> Commit.
> Trunk is now back to the way it was in r70.
> Simon

   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-21 19:25:00 CEST

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