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

Re: retroactive branch?

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: 2007-08-08 14:13:22 CEST

On Wednesday 08 August 2007 13:43, Noam Tamim wrote:
> A user has started a big change. He didn't create his own branch first, so
> he's in the trunk. His work is still ongoing, but he needs to commit.
> However in the current state, a commit will break the trunk.
>
> Is it possible to somehow retroactively branch his work, and later merge
> everything to the trunk?

svn copy $URL/trunk $URL/branches/eksperimental
svn switch . $URL/branches/eksperimental

In other words, you first create a copy of whatever his working copy is based
on (use a server-side copy for speed) and then switch the working copy to
that branch. The switch will (try to) apply all changes between the two URLs
to the working copy, which in this case are no changes at all. If you use
TSVN, I think there is even a utility that allows you to create a branch from
a working copy and switch the working copy to that branch.

BTW: even if he had already checked the whole thing into the trunk, you could
simply branch it in its current, experimental state and then undo
(reverse-merge) the changes. Switching to the WC remains the same, only
merging becomes more complicated, because you must never merge the first
change (the undo) of the trunk to the branch and you have to redo the
experimental changes before merging the branch to the trunk.

Uli

-- 
Sator Laser GmbH
Geschäftsführer: Ronald Boers, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 8 14:12:40 2007

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