Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>As you've certainly discovered, <b>copying to a target directory that already exists</b> won't work:</p> <pre>svn cp svn://my_project/vendor/1.1 svn://my_project/trunk</pre> <p>because trunk already exists, so you'd end up with:</p> <pre>svn://my_project/trunk/1.1</pre> <p>Using <strong>merge</strong> has the unfortunate property of not keeping history of the vendor 1.1 tag in subversion prior to 1.5 which introduced merge tracking. You may not care. In this case merge would be the correct solution:</p> <pre> svn co svn://my_project/trunk trunk-wc svn merge svn://my_project/trunk svn://my_project/vendor/1.1 trunk-wc </pre> <p>The best way to read this merge is: First determine the changes necessary to to make <code>trunk</code> identical to <code>vendor/1.1</code>, then apply those changes to the given working copy (also of trunk, in this case). </p> <p>I should point out that this merge will effectively blow away anything that was in trunk previously. So, if you have local (non-vendor) modifications already on the trunk, you'll want to apply just the changes between 1.1 and the previous vendor drop:</p> <pre> svn co svn://my_project/trunk trunk-wc svn merge svn://my_project/vendor/1.0 svn://my_prjoect/vendor/1.1 trunk-wc </pre> <p>If <strong>trunk exists, but is empty</strong> you've got two choices: replace the trunk, or write a little shell loop:</p> <p><strong>Replacing the trunk</strong> looks like this:</p> <pre> svn rm svn://my_project/trunk svn cp svn://my_project/vendor/1.1 svn://my_project/trunk </pre> <p><strong>Leveraging the shell</strong> (bash):</p> <pre> svn co svn://my_project/trunk trunk svn co svn://my_project/vendor/1.1 1.1 ( cd 1.1 for x in * ; do svn cp $x ../trunk done ) svn ci trunk </pre>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload