You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Rob <su...@theknack.net> on 2006/10/27 05:24:09 UTC
change existing branch to match trunk head?
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
Re: change existing branch to match trunk head?
Posted by Rob <su...@theknack.net>.
I had noticed the "switch" command, but if I update my working copy of
my branch that way, won't it become a checkout of the trunk instead of
my branch? I'm saying this because I had read that "switch" has the
same effect as doing a fresh checkout of the destination repository path
(only faster), whereas I can only check my working copy back in to my
*own* branch.
I see the --relocate option too, but if I check out the trunk and then
"relocate" it to my own branch, when I check in my working copy, it
wouldn't delete from my respository branch all the files and directories
that now exist in my outdated branch but have since been removed from
trunk, would it?
Thanks,
Rob.
Reinhard Brandstädter wrote:
>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
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: change existing branch to match trunk head?
Posted by Reinhard Brandstädter <re...@jku.at>.
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