Svn: copy branch to trunk

I have an SVN project with a branch I'm working on, and an empty chest:

myproject/
  branches/
    mybranch/
      {there stuff here}
  tags/
  trunk/

How can I copy the contents of mybranch into the trunk? TortoiseSVN complains that a trunk directory already exists. I can remove the (empty) connector line from the repository and then make a copy, but it seems wrong somehow ...


Explanation: I have a torso that I intentionally left empty. My "mybranch" is all registered. In the repo browser, TortoiseSVN gives me a copy option, but not a merge option.

If merging is the right thing, what should I do? Do I end up an empty pool, and then merge into this working copy, and then go in?


update: ; SVN , "" (branches/mybranch trunk) .

+5
5

, , , . , , , .

+3

svn trunk, .

... -ignore-ancestry

+2

, . , , , , . - .

+1

. :

  • trunk trunk_temp.

eclipse. svn- eclipse.  4. β†’ β†’ β†’ trunk_temp.
 5. β†’ " β†’ β†’ " β†’ " . . .

:

  • An existing trunk is renamed to trunk_temp. you can also create a branch.
  • tag is copied to trunk
  • remove trunk_temp if you created a branch.
-1
source

All Articles