Mercurial-合并存储库A-> B与B-> A的差异? [英] Mercurial - differences merging repository A->B vs B->A?

问题描述

给出存储库A和存储库B(是由变更集A2的克隆创建的):

Given repository A and repository B (created off a clone of changeset A2):

A1 - A2 - A3 - A4 - A5
        \
          B3 - B4

说，我们想将这两个存储库合并在一起.如果将回购B合并到回购A中与将回购A合并到回购B中有什么区别?

Say we wanted to merge these two repositories together. Is there any difference if we merged repo B into repo A versus merging repo A into repo B?

我能想到的唯一区别是本地/基础合并工具参数将被颠倒取决于您选择的选项.还有其他需要注意的区别吗?

The only diff I can think of is the merge tool local/base arguments would be reversed depending on which option you chose. Are there any other differences to be aware of?

推荐答案

通常合并是对称的，但有一些例外:

Generally merges are symmetric, with a few exceptions:

• 如果合并的头来自不同的命名分支，则顺序很重要.合并 修订将在第一位家长的分支机构上进行.
• 从 Mercurial 1.8.4 开始同样适用于书签，即仅书签
  的第一个父级将前进到合并修订版.
• 在log和diff视图中合并修订版本的父级的顺序不同，但是 (根据我的经验)没有任何值得注意的实际含义.

• If the merged heads are from different named branches, the order is important. The merge revision will be on the first parent's branch.
• Starting with Mercurial 1.8.4 the same applies to bookmarks, i.e. only the bookmark
  of the first parent will move forward to the merge revision.
• The order of the merge revision's parents in log and diff views is different, but that doest not have any noteworthy practical implications (from my experience).

这篇关于Mercurial-合并存储库A-> B与B-> A的差异?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！