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

Re: change existing branch to match trunk head?

From: Reinhard Brandstädter <reinhard.brandstaedter_at_jku.at>
Date: 2006-10-27 08:10:42 CEST

Hi Rob,

for exactly that reason there is tha svn switch command wich allows you to
change the working copy repository path:

see svn help switch:
switch (sw): Update the working copy to a different URL.
usage: 1. switch URL [PATH]
       2. switch --relocate FROM TO [PATH...]

  1. Update the working copy to mirror a new URL within the repository.
     This behaviour is similar to 'svn update', and is the way to
     move a working copy to a branch or tag within the same repository.

Reinhard

On Friday 27 October 2006 07:24, Rob wrote:
> I'm struggling with a simple problem.
>
> I've been doing all my coding on a working copy of the main-line in
> "trunk." Now I need to check in my code, but I only have write access
> to another branch created for me some months ago which is far out of
> date. How should I get my working copy of "trunk" checked in under my
> branch?
>
>
> I tried to start by updating my old branch to the current trunk by doing:
> svn merge https://x.com/svn/project/branches/mybranch/
> https://x.com/svn/project/trunk/ working_copy_of_mybranch
> This took almost 2 hours (there are about 3000 files) but didn't work
> anyways. Somehow there were conflicts, even though
> working_copy_of_mybranch was a fresh, unmodified checkout of mybranch.
> There must be a better way to go about this.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 27 08:23:23 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.