[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: François Beausoleil <fbeausoleil_at_ftml.net>
Date: 2004-07-13 14:57:23 CEST

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.

Let X be the revision number of the copy (CWD must be
/home/myuser/software/acme):
svn merge --revision X:X-1 file:///home/myuser/svn/acme/trunk

Hope that helps !
François

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 13 15:00:50 2004

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