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

Re: Making a branch the new trunk

From: Urs Thuermann <urs_at_isnogud.escape.de>
Date: 2006-06-09 15:20:43 CEST

"Gale, David" <David.Gale@Hypertherm.com> writes:

> I'm not sure how that approach would work for people who have a working
> copy of the trunk, as an update would only (I think; I haven't tested)
> say, "these files have been deleted" without knowing that they're being
> replaced by another line of code. And, of course, this appproach
> requires either two commits, with no trunk existing in the middle, or
> for someone to check out the entire repository--neither of which are
> ideal.

Yes, I tried and found that, too. I thought, the rm and mv could be
done without intervening commint, but it can't. That's why I tried
what you suggest:

> That said, a better option is to use merge:
> # svn co trunk
> # cd trunk
> # svn merge trunk branch .
> # svn ci -m "Replaced trunk with branch"

But I did check out the whole repository, and tried

  $ rm -rf TEST/
  $ svn co -q file://$HOME/SVN/TEST
  $ cd TEST
  $ ls
  branches tags trunk
  $ svn merge trunk branches/ut trunk
  svn: A working copy merge source needs an explicit revision
For some reason, svn requires revision numbers, so I did

  $ svn merge trunk@BASE branches/ut@BASE trunk
  D trunk/c
  U trunk/a
  U trunk/b
  A trunk/d
  $ svn ci -m"replace trunk with branch ut."

Why are the revision numbers revision here?

Also, the reason I wanted to avoid merge and instead use remove and
move, is that I thought the log message would state more clearly what
has been done. No I get

  $ svn log -v -r6
  r6 | urs | 2006-06-09 15:13:01 +0200 (Fri, 09 Jun 2006) | 2 lines
  Changed paths:
     M /trunk/a
     M /trunk/b
     D /trunk/c
     A /trunk/d (from /branches/ut/d:5)
  replace trunk with branch ut.

instead of something similar like

  D /trunk
  A /trunk (from: /branches/ut:5)
  D /branches/ut

which I would prefer.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 9 15:28:33 2006

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.