$ pwd
/home/user/project-trunk
$ svn update # (make sure the working copy is up to date)
At revision <N>.
$ svn merge --reintegrate ^/project/branches/branch_1
--- Merging differences between repository URLs into '.':
U foo.c
U bar.c
U .
$ # build, test, verify, ...
$ svn commit -m "Merge branch_1 back into trunk!"
Sending .
Sending foo.c
Sending bar.c
Transmitting file data ..
Committed revision <N+1>.
4 回答
Your svn merge syntax is wrong.
您想要签出
trunk
的工作副本,然后使用 svn merge --reintegrate 选项:有关详细信息,请参阅SVN book chapter on merging .
请注意,在编写时,这是正确的答案(并被接受),但事情已经发生了变化 . 查看topek的答案,http://subversion.apache.org/docs/release-notes/1.8.html#auto-reintegrate
如果您的工作目录指向主干,那么您应该能够将您的分支合并到:
一定要在trunk的根目录下发出这个命令
在主干中进行svn更新,记下修订号 .
从后备箱:
您可以通过执行svn日志来检查从主干切割分支的位置
语法错误,应该是