[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: Blair Zajac <blair_at_orcaware.com>
Date: 2007-06-29 02:41:40 CEST

You can delete 'foo' and copy or move 'bar' to 'foo' in the working copy if
'foo' is a file in a single commit from the working copy. It doesn't matter
what 'bar' is. However, 'foo' cannot be a directory.

See this for some thoughts on the working copy:

http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=128111

Blair

Talden wrote:
> I assume this is simply because of a limitation in the working copy
> capabilities to express two changes to the same structure - EG the old
> trunk and new trunk aren't the same 'file' but occupy the same
> book-keeping in the working copy.
>
> Has anyone filed an issue for the (hopefully) eventual redesign of the
> working-copy model? This would be a nice feature as it seems the same
> kind of situation is present when dropping new vendor code into a
> project from vendor branches.
>
> --
> Talden
>
> On 6/29/07, *Blair Zajac* <blair@orcaware.com
> <mailto:blair@orcaware.com>> wrote:
>
> You can use mucc or svnmucc (the new name in 1.5) to do these
> deletes and
> renames in a single commit. Mucc is in contrib/client-side/mucc.c.
>
> Regards,
> Blair
>
> Jamie Jackson wrote:
> > Yes, let's say that the code bases are entirely different. The
> only way
> > I know to do it is in two commits (unless I check out the whole tree,
> > delete the trunk with a client, move the branch to the trunk with a
> > client, then commit).
> >
> > So... I guess the heart of my question is: Is it possible, in a
> > straightforward manner, to effectively *replace* one directory with
> > another in a single commit?
> >
> > Hmm, maybe it doesn't even make sense to do this sort of thing.
> Now that
> > I think about it, I don't know why I'd want it to suddenly jump
> from one
> > code base to another, as it doesn't make sense to link any of the
> files
> > to past versions.
> >
> > ...Oh, I guess the reason is that it would violate my "rule"
> about not
> > having broken code (in this case, an entirely missing application,
> > albeit for a single revision) in the trunk.
> >
> > Thanks,
> > Jamie
> >
> > On 6/28/07, *Noah Spurrier* wrote:
> >
> > If the code bases are entirely different then you probably don't
> > care about the old history, so simply delete the old directory
> > svn del ./trunk/foo
> > then rename the new one to the old name
> > svn mv ./branch/foo_new ./trunk/foo
> > Were you looking for something more than that?
> >
> > Yours,
> > Noah
> >
> > On 2007-06-28 07:39-0400, Jamie Jackson 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.
> > >
> > > Thanks,
> > > Jamie

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 29 02:41:57 2007

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