Replacing trunk with branch in Subversion

前端 未结 6 695
梦谈多话
梦谈多话 2020-12-25 11:25

Let\'s say people have been working on the trunk and on a branch of a Subversion repository. I want to discard any changes on the trunk, and replace it with a copy of the br

6条回答
  •  时光取名叫无心
    2020-12-25 11:51

    Pre-1.5 this is simple: make sure your working copy points to trunk, then do "svn merge url-of-trunk url-of-branch". The changes you receive are the delta between trunk and branch, effectively "give me everything that's needed to make trunk look like branch."

    I have no idea if 1.5's new merge capabilities change this scenario.

提交回复
热议问题