SVN 合并没有找到我的更改
这是我发出的命令：
svn merge -r74:80 http://url.to/svn/branch/branch_name
它会思考一分钟，然后返回一个空白提示，就像两者之间没有区别一样。 我知道分支和主干之间存在差异。
我做错了什么？ :(
Here is the command I'm issuing:
svn merge -r74:80 http://url.to/svn/branch/branch_name
It will think for a minute, then return a blank prompt like there's no differences between the two.
I know for a fact that there are differences between the branch and trunk.
What am I doing wrong? :(
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
您的命令要求 svn 将分支内修订版 74 和 80 之间的差异合并到您的工作副本中。 这些修订中是否
显示了该分支的任何更改？
编辑： svn merge 获取存储库时空中的两个点，获取它们的差异并尝试将该差异合并到您的工作副本中。如果您想将更改从主干合并到分支，则需要签出该分支并按菜单
或
站在该目录中进行合并。然后，解决冲突、test(!) 和
svn ci。为什么 svn 会这样工作？让您有机会在将更改提交到存储库之前解决冲突并进行测试。
Your command asks svn to merge the differences between revisions 74 and 80 inside the branch into your working copy. Does
show any changes to that branch in these revisions?
Edit:
svn mergegets two points in repository space-time, takes their difference and tries to merge that difference into your working copy. If you want to merge changes from trunk to a branch, you will need to check out that branch and make a merge à laor
while standing in that directory. Then, resolve conflicts, test(!) and
svn ci.Why does svn work this way? To give you a chance to resolve conflicts and test before you submit changes to the repository.