Problems creating trunk and branches from existing repository

[Allison Bloodworth <ab...@berkeley.edu>]

Hi,

I had a repository with no trunk or branches and wanted to create structure
that allowed that. I am having trouble figuring out why when I create a
branch, I am getting a "trunk" subdirectory at the top of my branch when I
do an svn copy or svn update after an svn switch. This is causing big
problems when doing an svn switch to point newly created branches to the
trunk...I want the subdirectories in the trunk to be displayed in the
branch, not trunk > subdirectories.

I'm following the directions in the subversion book
(http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.using.
create), and I made a trunk directory and a branches/allison directory and
then moved everything from events to events/trunk (see commands used below).
Then to copy what was in the trunk directory to the allison branch, I was
unable to do move things in the way the book suggested:

svn copy svn+ssh://events@svn.berkeley.edu/svn/events/trunk
svn+ssh://events@svn.berkeley.edu/svn/events/branches/Allison

...because it created a trunk directory under "allison". I had to instead to
copy each individual folder under trunk, like this:
svn copy
svn+ssh://events@svn.berkeley.edu/svn/events/trunk/FreeEnergyModules
svn+ssh://events@svn.berkeley.edu/svn/events/branches/Allison

Now I am doing switches like this on other checkouts to point them to trunk:
svn switch svn+ssh://events@svn.berkeley.edu/svn/events/trunk

But when I do an svn update, I get a directory structure with trunk >
subdirectories, which is not what I want.

I am really in need of some assistance here...any help is appreciated!!

Thanks!
Allison

---------------------------

svn mkdir trunk svn+ssh://events@svn.berkeley.edu/svn/events
svn mkdir branches svn+ssh://events@svn.berkeley.edu/svn/events
svn move svn+ssh://events@svn.berkeley.edu/svn/events/FreeEnergyModules
svn+ssh://events@svn.berkeley.edu/svn/events/trunk
svn move svn+ssh://events@svn.berkeley.edu/svn/events/build
svn+ssh://events@svn.berkeley.edu/svn/events/trunk
svn move svn+ssh://events@svn.berkeley.edu/svn/events/htdocs
svn+ssh://events@svn.berkeley.edu/svn/events/trunk
svn move svn+ssh://events@svn.berkeley.edu/svn/events/test_show.xml.php
svn+ssh://events@svn.berkeley.edu/svn/events/trunk

Allison Bloodworth
Principal Administrative Analyst
Technology Program Office
University of California, Berkeley
(415) 377-8243
abloodworth@berkeley.edu




---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Problems creating trunk and branches from existing repository

[Baz <br...@gmail.com>]

On 5/1/06, Allison Bloodworth <ab...@berkeley.edu> wrote:
[snip]
> create), and I made a trunk directory and a branches/allison directory and
> then moved everything from events to events/trunk (see commands used below).
> Then to copy what was in the trunk directory to the allison branch, I was
> unable to do move things in the way the book suggested:
>
> svn copy svn+ssh://events@svn.berkeley.edu/svn/events/trunk
> svn+ssh://events@svn.berkeley.edu/svn/events/branches/Allison
>
> ...because it created a trunk directory under "allison". I had to instead to
[snip]

The problem is that the Allison directory existed before you tried to
do the copy. Its the same as working with the filesystem, 'cp trunk
branches/allison' creates 'branches/allison/trunk' if allison is an
existing directory. If you had only created the branches directory,
not the Allison directory, this should have worked.

-Baz

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org