svn - 我如何在 svn 中显示 "merge forward"？

Question

例如，假设我有一个分支，我想用主干中的新内容进行更新。我一直只是将主干合并到新分支中，但我遇到了一个有点 different process 的问题那Divmod使用。 divmod 是否有某种特殊要求才能像这样进行分支，还是我一直做错了？

Answer 1

您目前使用的方式是 Subversion 手册 suggests 的方式.

看起来 Divmod 这样做是因为 1.5 之前的合并语法:

As one example of such a problem, in SVN one must always pass the revision where the branch was created on trunk as an argument to the merge command, and determining that number involves reading the output of another long-running command. Some branches cannot be merged in this manner, depending on where the branch was originally created from.

( Source )

这不再是真的。