SVN 合并并发症
我做了一些研究，似乎找到的答案与我的情况相差大约 4 英寸。
我们已经建立了一个 SVN，目前有第三方在不同的分支上不断开发。我们需要定期了解他们的进展。
首先，我们让它们与我们的主干同步，以引入更改并通过运行以下命令解决任何潜在的冲突：
svn merge url/to/trunk
现在，我们正尝试从它们中拉回。然而，svn 似乎不知道最后一次合并来自 trunk。
当我们在主干结账上运行：时
svn merge url/to/third/party/branch
，它会尝试重新应用相同的更改，从而导致大量“本地添加，合并时传入添加”。
我有什么遗漏的吗？绘制自上次合并以来的更改并使 SVN 了解在主干中开始的更改的正确方法是什么？
另外，这是我们应该使用的正确流程来吸收他们在我们需要更新时所做的更改吗？
I've done a bit of research, and seem to find answers just about 4 inches off the mark for my situation.
We've got an SVN set up that currently has a third party continually developing on a different branching. Periodically we need to draw in their progress.
To start, we had them sync up with our trunk to draw in out changes and resolve any potential conflicts by running:
svn merge url/to/trunk
Now, we are trying to pull back in from them. However, svn doesn't seem to know that the last merge was from trunk.
When we run:
svn merge url/to/third/party/branch
on our trunk checkout, it's attempting to reapply the same changes, resulting in a huge number of "local add, incoming add upon merge".
Is there something I'm missing? What would be the proper way to draw in the changes since the last merge and have SVN know about changes that started in trunk?
Also, is this the correct process we should be using to draw in changes they make as we require the updates?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
尝试将
--reintegrate标志传递回主干http://blogs.collab.net/subversion/2008/07/subversion-merg/ （有关合并与重新集成的良好链接，如 @doc_180 所推荐）
Try passing the
--reintegrateflag to the merge back in to trunkhttp://blogs.collab.net/subversion/2008/07/subversion-merg/ (good link on merging with reintegrate as recommended by @doc_180)
之前，我投入了 2 美分。如果您发现如何在 SVN 中无缝执行合并，请告诉我。
如果您在 SVN 中执行大量合并，那么您可以使用 SvnMerge.py 图书馆。这有助于大多数合并用例的自动化。
这是从他们的常见问题解答中粘贴的吗？
svmerge 解决什么问题？
如果我们必须将相同的更改应用到另一个分支，Subversion 已经有一个方法可以做到这一点。
传统的颠覆将允许您合并更改，但它不会“记住”您已经合并的内容。它还没有提供一种方便的方法来排除更改集的合并。 svnmerge.py 自动化了一些工作，并简化了它。 Svnmerge 还会创建一条提交消息，其中包含来自其合并的所有内容的日志消息。
这个工具确实帮助我在 SVN 中进行合并。但我最终发现，当我们必须执行频繁的合并时，Git 比 SVN 好得多。 （因此要求分享您的发现）
Before, I put in my 2 cents. Please let me know if you find out, how to perform merging in SVN seamlessly.
If you are performing large number of merges in SVN, then you could use the SvnMerge.py library. This helps in automation of most of the merging use cases.
This is pasted from their FAQ?
What problem does svnmerge solve?
If we have to apply the same change to another branch, subversion already has a method for doing this.
Traditional subversion will let you merge changes, but it doesn't "remember" what you've already merged. It also doesn't provide a convenient way to exclude a change set from being merged. svnmerge.py automates some of the work, and simplifies it. Svnmerge also creates a commit message with the log messages from all of the things it merged.
This tool did help me with Merging in SVN. But I eventually found Git much better than SVN, when we have to perform frequent merges. (and hence the request to share your findings)