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

RE: Re: How to branch already-committed revisions?

From: Jon Daley <tortoise_at_jon.limedaley.com>
Date: 2007-08-16 15:41:31 CEST

On Thu, 16 Aug 2007, Simon Wray wrote:
>> On 16/08/07, Simon Wray <Simon.Wray@xchanging.com> wrote:
>>> I have a number of revisions committed to the central development
> trunk,
>>> done over the last few weeks, made across several files. This project
> has
>>> been halted. Is it possible to now create a new branch and move these
>>> revisions from the trunk onto the branch? I.e. is there an
> established
>>> process or tool to do this?

>> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html

> -----This Message-----
> I've read through that documentation and understand the premise of
> branching.
>
> Am I correct in thinking that what I really need to do is:
> 1. Archive all my revisions locally.
> 2. Reverse-merge my revisions from /trunk (in effect rolling them back).
> 3. Creating a new branch.
> 4. Applying my archived revisions to this branch.

No, you don't need to do anything locally.

Say you are currently at revision 100.

You meant to branch at revision 50.

You simply need to copy trunk@r50 to branch
Then merge from 50-100 from trunk to the branch.
Then reverse merge / delete all revisions 50-100 in the trunk.

Subversion won't really erase the changes once you reverse merge them.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Aug 16 15:39:15 2007

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