Question

使用git-svn将我的存储库转换为Git之后，我看到了原始的“master”提交以及这些提交到我的stable分支的合并都出现在stable分支上。该分支的日志如下所示：

commit 6e18557b8f7e7173d26df7dd1857362c27eb3ab1
Merge: e36cfba c8a400c
Author: <author>
Date:   Fri Jun 25 21:00:19 2010 +0000

    PROJ-6648 (Merged from Trunk): Updated the API version in build file

    git-svn-id: file:///Users/Developers/git_transition/svn_repo/6.7@14254 f4356f54-06d4-464e-91d3-36485834cb4b

commit c8a400c3ef8ac113dd325382bedd073bfedc3dd1
Author: <author>
Date:   Fri Jun 25 20:39:33 2010 +0000

    PROJ-6648: Updated the API version in build file

    git-svn-id: file:///Users/Developers/git_transition/svn_repo/trunk@14253 f4356f54-06d4-464e-91d3-36485834cb4b

commit 9b968ba82f6f850919c41702dc024703e5721b7e
Merge: 9ef2df8 c628db1
Author: <author2>
Date:   Fri Jun 25 14:45:30 2010 +0000

    PROJ-6819: (Merged from Trunk) Reverted changes from last commit where initialize and teardown were called on each sftpshuttle invocation.  Now using a strategy where

    git-svn-id: file:///Users/Developers/git_transition/svn_repo/6.7@14251 f4356f54-06d4-464e-91d3-36485834cb4b

commit c628db12ef8136cdf22749058e8d8682d0021b8b
Author: <author2>
Date:   Thu Jun 24 20:10:53 2010 +0000

    PROJ-6819: Reverted changes from last commit where initialize and teardown were called on each sftpshuttle invocation.  Now using a strategy where the retries counter

    git-svn-id: file:///Users/Developers/git_transition/svn_repo/trunk@14240 f4356f54-06d4-464e-91d3-36485834cb4b

在将提交到trunk的提交合并到分支之后，我直接看到了对原始trunk提交的提交。

我可以理解在创建分支之前在分支历史中显示的trunk提交，但之后看起来主干和分支应该具有不同的历史记录。我确实注意到这些重复提交的“Merge”属性，但无法弄清楚它的重要性。

Answer 1

确认这是从支持合并跟踪的SVN版本迁移到Git时的预期行为。基本上，它使用svn：merge-info元数据来获取原始提交到主干的提交信息，并将该信息合并到分支中。合并提交日志中的Merge属性显示它将分支拼接在一起的位置以及对正在合并的主干的提交。

Git：承诺在其他分支机构中出现“主”分支

1 个答案: