将TortoiseSVN中的分支与历史合并 [英] Merging Branch in TortoiseSVN with history

问题描述

我在一个简单的仓库里工作，那里有一辆卡车和一个分支机构.自分支分支以来，未对主干进行任何更改，并且分支上已进行了许多提交.我如何将分支合并回主干，以便在一个历史中将分支中的全部历史记录包含在更改中?

I am working in a simple repository, with a truck and one branch. No change s have been made to the trunk since the branch, and a number of commits have been made on the branch. How do I merge the branch back into the trunk so that I get the full history included changes while it was in the branch in one history?

推荐答案

非常感谢这一批.对我来说很完美！我还有一点点补充: 我把svn更新放在svn提交行之后.像这样:

Thanks a lot for this batch. Works perfect for me! I have a small addition to it: I put svn update after the svn commit line. Like this:

svn commit -F tmp-commit.txt
svn update

否则，在每次下一次提交时，SVN都会向您返回一条消息请在尝试提交到最新版本的WC时更新您的WC"

otherwise on every next commit SVN would return you a message "Please, update your WC as you are trying to commit into a WC of not latest revision"

这篇关于将TortoiseSVN中的分支与历史合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！