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

Re: how to completely replace the trunk of a repo with one of its branches?

From: Ryan Schmidt <subversion-2007b_at_ryandesign.com>
Date: Wed, 23 Jan 2008 03:12:09 -0600

On Jan 22, 2008, at 09:46, Fouts Christopher (QNA RTP PT PREV) wrote:

>>> What Reuben could do, though, is:
>>> svn rm url://to/repo/trunk -m "removing old trunk"
>>> svn cp url://to/repo/branches/somebranch url://to/repo/trunk -m
>>> "creating new trunk as copy of somebranch"
>> Ryan, et al, I'm about to do this. How will these affect
>> existing branches that have to-from tags with the trunk before
>> the rm/cp trunk procedure?
> I don't know if my response went through yesterday.
> Here's what I mean.
> - I create 2 branches off trunk branchA and branchB
> - I create merge tags for branchA/trunk merges, called
> trunk-to-branchA and branchA-to-trunk for example
> - I develop on branchA and branchB
> - I svn rm //.../trunk
> - I svn cp //.../branchB //.../trunk
> Can I still then svn merge //.../trunk-to-branchA //.../trunk
> to merge trunk onto my branchA for example? If I understand
> SVN correctly, this should be ok, but just wanted the experts'
> opinions.

Ah, I don't know if that usage of tags will still work. I don't use
tags in that way. Maybe you'll need to specify the --ignore-ancestry
option when you merge. I'm not sure. You should test this scenario in
a throwaway repository and make sure things work ok for you before
doing this in your main repository.

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-23 10:12:46 CET

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.