Subversion合併行爲

我創建了一個快速示例來演示我的問題。在日誌下面你將看到以下內容：Subversion合併行爲

R1 - 創建主幹
R2 - 創建分支
3 - 添加到foo.txt的樹幹
4 - 創建QA分支
R5 - 創建英國分公司
R6 - 創建團隊分支
R7 - 更新foo.txt的和團隊分支加入吧
個R8 - 合併隊進入QA
R9 - 合併QA到主幹

所以我的問題是，當我嘗試這樣做， SVN合併-R 9：HEAD^/主幹來自英國的目錄中我不t得到的r9變化是這個預期的行爲？

 
svn log -v -g ^/ 
------------------------------------------------------------------------ 
r9 | anazimok | 2012-03-15 21:16:37 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    M /trunk 
    A /trunk/bar (from /branches/QA/bar:8) 
    M /trunk/foo.txt 

merged QA into trunk 
------------------------------------------------------------------------ 
r8 | anazimok | 2012-03-15 21:16:34 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    M /branches/QA 
    A /branches/QA/bar (from /branches/TEAM/bar:7) 
    M /branches/QA/foo.txt 
Merged via: r9 

merged team into QA 
------------------------------------------------------------------------ 
r7 | anazimok | 2012-03-15 21:16:32 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    A /branches/TEAM/bar 
    M /branches/TEAM/foo.txt 
Merged via: r9, r8 

updated on team branch 
------------------------------------------------------------------------ 
r7 | anazimok | 2012-03-15 21:16:32 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    A /branches/TEAM/bar 
    M /branches/TEAM/foo.txt 
Merged via: r9 

updated on team branch 
------------------------------------------------------------------------ 
r8 | anazimok | 2012-03-15 21:16:34 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    M /branches/QA 
    A /branches/QA/bar (from /branches/TEAM/bar:7) 
    M /branches/QA/foo.txt 

merged team into QA 
------------------------------------------------------------------------ 
r7 | anazimok | 2012-03-15 21:16:32 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    A /branches/TEAM/bar 
    M /branches/TEAM/foo.txt 
Merged via: r8 

updated on team branch 
------------------------------------------------------------------------ 
r7 | anazimok | 2012-03-15 21:16:32 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    A /branches/TEAM/bar 
    M /branches/TEAM/foo.txt 

updated on team branch 
------------------------------------------------------------------------ 
r6 | anazimok | 2012-03-15 21:16:29 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    A /branches/TEAM (from /branches/QA:5) 

created team 
------------------------------------------------------------------------ 
r5 | anazimok | 2012-03-15 21:16:29 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    A /branches/UK (from /trunk:4) 

created UK 
------------------------------------------------------------------------ 
r4 | anazimok | 2012-03-15 21:16:29 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    A /branches/QA (from /trunk:3) 

created QA 
------------------------------------------------------------------------ 
r3 | anazimok | 2012-03-15 21:16:28 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    A /trunk/foo.txt 

initial commit 
------------------------------------------------------------------------ 
r2 | anazimok | 2012-03-15 21:16:27 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    A /branches 

created branches 
------------------------------------------------------------------------ 
r1 | anazimok | 2012-03-15 21:16:27 -0400 (Thu, 15 Mar 2012) | 1 line 
Changed paths: 
    A /trunk 

created trunk 
------------------------------------------------------------------------

來源

2012-03-16 anazimok

你需要指定一個版本低於你的預期的，所以儘量

svn merge -r8:HEAD ^/trunk

來源

2012-03-16 01:53:18

可以省略合併範圍在簡單的情況。但安德烈亞斯是完全正確的：範圍不包括爲開始邊界

來源

2012-03-16 03:06:12

Subversion合併行爲

回答

相關問題