2010-07-12 276 views
0

在使用git-svn將我的存儲庫轉換爲Git後,我看到原始的「主」提交以及這些提交合併到我的stable分支中,在穩定的分支上。日誌對於分支看起來是這樣的:後Git:提交「主」分支出現在其他分支

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/[email protected] 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/[email protected] 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/[email protected] 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/[email protected] f4356f54-06d4-464e-91d3-36485834cb4b 

直接提交該合併提交到主幹到分支,我看到了承諾爲原樹幹提交。

我可以理解分支創建之前分支歷史中顯示的主幹提交,但之後看起來主幹和分支應該有不同的歷史記錄。我注意到這些重複提交的「合併」屬性,但無法弄清楚它的意義。

回答

0

得到確認,這是從支持合併跟蹤的SVN版本遷移到Git時的預期行爲。基本上,它使用svn:merge-info元數據來派生原始提交到中繼的提交信息,並將該信息合併到分支中。合併提交日誌上的「合併」屬性顯示它將分支和提交拼接到合併的中繼的位置。