copying vendor import to trunk, not subdirectory

I followed a procedure (below) to import the first of many vendor releases
of a software package I want to customize. The last step, copying the
vendor branch to the trunk is not working the way I need it to. I anyone
can suggest a modification to the procedure so I can make a fresh start
with it, it would be greatly appreciated. Thanks.

Initial repository creation and skeleton import

$ svnadmin create /home/myuser/svn/acme
$ mkdir /home/myuser/software/acme-initial
$ cd /home/myuser/software/acme-initial
$ mkdir branches tags trunk vendor
$ svn import /home/myuser/software/acme-initial
file:///home/myuser/svn/acme -m "initial import"

Location for Working copy

$ cd /home/myuser/software/
$ svn checkout file:///home/myuser/svn/trunk acme

Import the earliest version of the vendor source

$ svn import /home/myuser/software/acme-tarballs/acme.0.5/acme \
             file:///home/myuser/svn/acme/vendor/acme/current \
             -m 'importing initial 0.5 vendor drop'

Manually tag the initial release by copying current to a version name

$ svn copy file:///home/myuser/svn/acme/vendor/acme/current \
           file:///home/myuser/svn/acme/vendor/acme/0.5 \
           -m 'tagging acme-0.5'

Copy the named initial release into the trunk.

$ svn copy file:///home/myuser/svn/acme/vendor/acme/0.5 \
           file:///home/myuser/svn/acme/trunk \
           -m 'bringing acme-0.5 into the main branch'

Unfortunately, this copies '0.5' into the trunk, not the 0.5 contents:

$ cd /home/myuser/software/acme
$ svn update
A 0.5
A 0.5/index.html
A 0.5/README.TXT
A 0.5/docs/CHANGES.TXT
(...)

How do I correct this, so that the 0.5 version gets pulled from the vendor
directory to the trunk? I am more than willing to destroy this repository
and create a new one, so feel free to quote the commands above with
corrections if there is a better way to do this. Thanks.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 12 22:15:40 2004