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

Re: Promote (Not Merge) Branch to Trunk

From: deckrider <deckrider_at_gmail.com>
Date: 2007-06-28 20:02:36 CEST

On 6/28/07, Jamie Jackson <myspamb8@gmail.com> wrote:
> As it turns out, in this case, you were right, and this branch was a normal
> one (i.e., its genesis was as a copy of the trunk). Therefore, your method
> *did* work.
>
> I had thought I was going to be working with unrelated code bases.
>
> However, my question still stands about a clobbering merge, because I've had
> that scenario before. (I've posted back to the list for this.)

As far as I know, you can do the merge approach on arbitrarily
unrelated code, so long as they are within the same repository (svn
database):

svn co [unrelated url a] dir
cd dir
svn merge [unrelated url a] [unrelated url b]

> On 6/28/07, deckrider wrote:
> > On 6/28/07, Jamie Jackson < myspamb8@gmail.com> wrote:
> > > Is there a way to promote a branch to the trunk in one commit? We do not
> > > care to merge, as the code base is entirely different.
> >
> > So if you want to replace contents of the trunk with the contents of
> > the branch, I would check out the trunk, and then do something like
> > this:
> >
> > svn merge [trunk url] [branch url]
> >
> > If the above turns out well, then svn commit.
> >
> > Or you could svn remove the trunk and rename the branch to the trunk
> > ... I guess it all depends on what you expect later (I'm not really
> > sure of the expectations surrounding the use of the word 'promote').
> >
>
>

-- 
ASCII ribbon campaign:
()  against HTML email
/\  against Microsoft attachments
    Information:  http://www.expita.com/nomime.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 28 20:02:52 2007

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