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

Re: branching best practice

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-05-20 05:56:36 CEST

Ryan Schmidt <subversion-2007b@ryandesign.com> writes:
> Doesn't this method make it impossible to later merge these changes
> back into the trunk with
>
> $ svn merge -r$START:$END http://blahblahblah/repos/branches/
> my_new_branch wc_of_trunk
>
> where $START is the revision in which the branch was created and $END
> is HEAD or whatever?

That's right. You'd have to use a more complex series of merge
commands to achieve the desired effect.

>> Another way is to create a branch from a pristine revision:
>> [...]
>
> This is the method I would advocate.

Me too, in almost all circumstances.

-Karl

-- 
Subversion support & consulting  <>  http://producingoss.com/consulting.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun May 20 05:56:55 2007

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

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