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

Re: [Subclipse-users] Noobie: Convert working copy to new branch

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-08-24 02:11:47 CEST

Graham Anderson <grahama1970@gmail.com> wrote on 08/23/2006 06:18:49 PM:

> How do you transform a working copy into a new branch or tag ?
> Since my last commit, my working copy is turning into a
> tangent....full of bugs and half baked ideas ;)
> Rather than revert my working copy, I would rather save my current
> working copy as a new branch or a tag
> what is the best way to do this ?

Easy way:

Team -> Create Branch/Tag

Specify URL to store it, and be sure to select option to create from
working copy. Since your project is still on trunk after this completes,
you have to do a Revert to get the project back to a pristine condition.
Use Team -> Switch when you want to go back to the branch code.

Better way:

Do Team -> Update on your project so that your entire working copy is
updated to a single, known revision.
Do Team -> Create Branch/Tag and create a branch directly in the
repository using that known revision.
Do Team -> Switch to swap your working copy to the branch. Since it was
already based on that revision, this will be quick and simple.
Do Team -> Commit to commit your changes to the branch.
Do Team -> Switch to swap back to trunk.

Why is this "better" when it is so many steps? It separates the creation
of the branch from the commit of your changes. This makes it easier to
create a patch with your changes, or to later merge them back to trunk.

The "easy" method is fast and simple way to stash your changes but it will
be harder to later reintegrate those changes to the trunk.


To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Thu Aug 24 02:11:59 2006

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

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