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

Re: copying vendor import to trunk, not subdirectory

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2004-07-13 16:59:08 CEST

Jeff Kowalczyk wrote:
> François Beausoleil wrote:
>
>>Hello Jeff,
>>Jeff Kowalczyk wrote:
>>
>>>$ 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
>>>(...)
>>
>>You need to read up on svn merge. Please see the book, there's even an
>>example of this in the vendor drop section.
>>
>>To revert the copy, simply reverse merge the changes of the revision in
>>which the copy was made.
>
>
> Thanks. I was in fact following the vendor drop section of the book,
> including the second copy (which seemed like it should be a merge to me,
> too.) http://svnbook.red-bean.com/svnbook/ch07s04.html
>
> The commands are nearly verbatim, except that I'm trying to 'merge' my
> vendor drop into the root directory of the trunk, not a subdirectory:
>
> /home/myuser/software/acme/index.html README.TXT (...)
>
> instead of
>
> /home/myuser/software/acme/0.5/index.html README.TXT (...)
>
> Is there any way I can do that?

Just don't create the initial empty 'trunk' directory, then do the copy.
  Your copy will create a trunk directory as a copy of the 5.0
directory, rather than placing the 5.0 directory inside the trunk directory.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 13 16:59:45 2004

This is an archived mail posted to the Subversion Users mailing list.