Exam Subversion merge work.

summary.txt

A   4-6-7-----10----------14---|16----18----20----------24----26
   /       \ /           /  \  |     /  \  /           /  \  /
T-3---------9-------12-------15|---------19-------22-------25
   \            \  /  \        |              \  /  \
B   5-----8------11----13------|---17----------21----23


### rev.3
common_folder/file1.txt
common_folder/file2.txt
common_folder/file3.txt
alice_folder/file.txt
bob_folder/file.txt


### rev.6
echo "modified in A.6" >> alice_folder/file.txt
echo "create in A.6" >> alice_folder/file2.txt


### rev.7
mkdir alice_folder/folder; echo "create folder in A.7" >> alice_folder/folder/file3.txt


### rev.8
echo "fugafuga B.8" >> bob_folder/file.txt
echo "create in B.8" >> bob_folder/file2.txt
mkdir bob_folder/folder; echo "create folder in B.8" >> bob_folder/folder/file3.txt


### rev.16
# 同じファイルの別の箇所を編集
STR=`echo "insert in A.16"; cat common_folder/file1.txt`; echo "$STR" > common_folder/file1.txt

# 同じファイルの同じ箇所を編集# 同じ内容
echo "modified in A & B" >> common_folder/file2.txt
# 同じファイルの同じ箇所を編集# 違う内容
echo "insert in A.16" >> common_folder/file3.txt

# 同じファイルを新規追加# 同じ内容
echo "create in A & B" >> common_folder/new_file1.txt
# 同じファイルを新規追加# 違う内容
echo "create in A.16" >> common_folder/new_file2.txt

# 同じフォルダを新規追加 # 中のファイルも同じ
mkdir common; echo "create folder in A.16" > common/file1.txt
echo "create folder in A & B" > common/file2.txt
# 同じフォルダを新規追加 # フォルダは同じでファイルは違う
mkdir other; echo "create folder in A.16" > other/file1.txt


### rev.17
# 同じファイルの別の箇所を編集
echo "insert in B.17" >> common_folder/file1.txt
# 同じファイルの同じ箇所を編集 # 同じ内容
echo "modified in A & B" >> common_folder/file2.txt
# 同じファイルの同じ箇所を編集 # 違う内容
echo "insert in B.17" >> common_folder/file3.txt

# 同じファイルを新規追加# 同じ内容
echo "create in A & B" >> common_folder/new_file1.txt
# 同じファイルを新規追加# 違う内容
echo "create in B.17" >> common_folder/new_file2.txt

# 同じフォルダを新規追加 # 中のファイルも同じ
mkdir common; echo "create folder in B.17" > common/file1.txt
echo "create folder in A & B" > common/file2.txt
# 同じフォルダを新規追加 # フォルダは同じでファイルは違う
mkdir other; echo "create folder in B.17" > other/file2.txt

svn_exam.log

[~/dev/test/svntest]% export SP=file://${HOME}/dev/test/svntest/repos
[~/dev/test/svntest]% svnadmin create repos
[~/dev/test/svntest]% svn mkdir $SP/app1 -m "create app1"
Committed revision 1.
[~/dev/test/svntest]% svn mkdir $SP/app1/trunk $SP/app1/branches $SP/app1/tags -m "init"
Committed revision 2.
[~/dev/test/svntest]% svn ls $SP/app1
branches/
tags/
trunk/
[~/dev/test/svntest]% mkdir -p app1/trunk app1/alice app1/bob
[~/dev/test/svntest]% cd app1/trunk
[../svntest/app1/trunk]% svn co $SP/app1/trunk .
Checked out revision 2.
[../svntest/app1/trunk]% mkdir common_folder alice_folder bob_folder
[../svntest/app1/trunk]% echo "init rev.3" > common_folder/file1.txt
[../svntest/app1/trunk]% echo "init rev.3" > common_folder/file2.txt
[../svntest/app1/trunk]% echo "init rev.3" > common_folder/file3.txt
[../svntest/app1/trunk]% echo "init rev.3" > alice_folder/file.txt
[../svntest/app1/trunk]% echo "init rev.3" > bob_folder/file.txt
[../svntest/app1/trunk]% svn add *
A         alice_folder
A         alice_folder/file.txt
A         bob_folder
A         bob_folder/file.txt
A         common_folder
A         common_folder/file1.txt
A         common_folder/file2.txt
A         common_folder/file3.txt
[../svntest/app1/trunk]% svn status
A       common_folder
A       common_folder/file2.txt
A       common_folder/file3.txt
A       common_folder/file1.txt
A       alice_folder
A       alice_folder/file.txt
A       bob_folder
A       bob_folder/file.txt
[../svntest/app1/trunk]% svn ci -m "add initial files"
Adding         alice_folder
Adding         alice_folder/file.txt
Adding         bob_folder
Adding         bob_folder/file.txt
Adding         common_folder
Adding         common_folder/file1.txt
Adding         common_folder/file2.txt
Adding         common_folder/file3.txt
..Transmitting file data ...cd ..
Committed revision 3.
[../svntest/app1/trunk]% cd ..
[..v/test/svntest/app1]% svn cp $SP/app1/trunk $SP/app1/branches/alice -m "copy to alice"
Committed revision 4.
[..v/test/svntest/app1]% svn cp $SP/app1/trunk $SP/app1/branches/bob -m "copy to bob"
Committed revision 5.
[..v/test/svntest/app1]% cd alice
[../svntest/app1/alice]% svn co $SP/app1/branches/alice .
A    common_folder
A    common_folder/file2.txt
A    common_folder/file3.txt
A    common_folder/file1.txt
A    alice_folder
A    alice_folder/file.txt
A    bob_folder
A    bob_folder/file.txt
Checked out revision 5.
[../svntest/app1/alice]% echo "modified in A.6" >> alice_folder/file.txt
[../svntest/app1/alice]% echo "create in A.6" >> alice_folder/file2.txt
[../svntest/app1/alice]% svn add alice_folder/file2.txt
A         alice_folder/file2.txt
[../svntest/app1/alice]% svn status
A       alice_folder/file2.txt
M       alice_folder/file.txt
[../svntest/app1/alice]% svn ci -m "mod in alice"
Sending        alice_folder/file.txt
Adding         alice_folder/file2.txt
.Transmitting file data ..
Committed revision 6.
[../svntest/app1/alice]% mkdir alice_folder/folder; echo "create folder in A.7" >> alice_folder/folder/file3.txt
[../svntest/app1/alice]% svn add alice_folder/folder
A         alice_folder/folder
A         alice_folder/folder/file3.txt
[../svntest/app1/alice]% svn status
A       alice_folder/folder
A       alice_folder/folder/file3.txt
[../svntest/app1/alice]% svn ci -m "mod in alice"
Adding         alice_folder/folder
Adding         alice_folder/folder/file3.txt
Transmitting file data ..
Committed revision 7.
[../svntest/app1/alice]% cd ..
[..v/test/svntest/app1]% cd bob
[..st/svntest/app1/bob]% svn co $SP/app1/branches/bob .
A    common_folder
A    common_folder/file2.txt
A    common_folder/file3.txt
A    common_folder/file1.txt
A    alice_folder
A    alice_folder/file.txt
A    bob_folder
A    bob_folder/file.txt
Checked out revision 7.
[..st/svntest/app1/bob]% echo "fugafuga B.8" >> bob_folder/file.txt
[..st/svntest/app1/bob]% echo "create in B.8" >> bob_folder/file2.txt
[..st/svntest/app1/bob]% svn add bob_folder/file2.txt
A         bob_folder/file2.txt
[..st/svntest/app1/bob]% mkdir bob_folder/folder
[..st/svntest/app1/bob]% echo "create folder in B.8" >> bob_folder/folder/file3.txt
[..st/svntest/app1/bob]% svn add bob_folder/folder
A         bob_folder/folder
A         bob_folder/folder/file3.txt
[..st/svntest/app1/bob]% svn status
A       bob_folder/file2.txt
A       bob_folder/folder
A       bob_folder/folder/file3.txt
M       bob_folder/file.txt
[..st/svntest/app1/bob]% svn ci -m "mod in bob"
Sending        bob_folder/file.txt
Adding         bob_folder/file2.txt
Adding         bob_folder/folder
Adding         bob_folder/folder/file3.txt
..Transmitting file data .cd ..
Committed revision 8.
[..st/svntest/app1/bob]% cd ..
[..v/test/svntest/app1]% cd trunk
[../svntest/app1/trunk]% svn update
At revision 8.
[../svntest/app1/trunk]% svn diff ^/app1/trunk ^/app1/branches/alice
Index: alice_folder/file2.txt
===================================================================
--- alice_folder/file2.txt	(.../trunk)	(revision 0)
+++ alice_folder/file2.txt	(.../branches/alice)	(revision 8)
@@ -0,0 +1 @@
+create in A.6
Index: alice_folder/folder/file3.txt
===================================================================
--- alice_folder/folder/file3.txt	(.../trunk)	(revision 0)
+++ alice_folder/folder/file3.txt	(.../branches/alice)	(revision 8)
@@ -0,0 +1 @@
+create folder in A.7
Index: alice_folder/file.txt
===================================================================
--- alice_folder/file.txt	(.../trunk)	(revision 8)
+++ alice_folder/file.txt	(.../branches/alice)	(revision 8)
@@ -1 +1,2 @@
 init rev.3
+modified in A.6
[../svntest/app1/trunk]% svn merge --dry-run ^/app1/branches/alice
--- Merging r4 through r8 into '.':
A    alice_folder/file2.txt
A    alice_folder/folder
A    alice_folder/folder/file3.txt
U    alice_folder/file.txt
[../svntest/app1/trunk]% svn merge ^/app1/branches/alice
--- Merging r4 through r8 into '.':
A    alice_folder/file2.txt
A    alice_folder/folder
A    alice_folder/folder/file3.txt
U    alice_folder/file.txt
[../svntest/app1/trunk]% svn status
 M      .
A  +    alice_folder/file2.txt
A  +    alice_folder/folder
A  +    alice_folder/folder/file3.txt
M       alice_folder/file.txt
[../svntest/app1/trunk]% svn ci -m "Merged from alice"
Sending        .
Sending        alice_folder/file.txt
Adding         alice_folder/file2.txt
Adding         alice_folder/folder
Adding         alice_folder/folder/file3.txt
Transmitting file data ...
Committed revision 9.
[../svntest/app1/trunk]% cd ..
[..v/test/svntest/app1]% cd alice
[../svntest/app1/alice]% svn update
At revision 9.
[../svntest/app1/alice]% svn merge --dry-run ^/app1/trunk
--- Merging r4 through r9 into '.':
   C alice_folder/file2.txt
   C alice_folder/folder
Summary of conflicts:
  Tree conflicts: 2
[../svntest/app1/alice]% svn merge --accept theirs-full ^/app1/trunk
--- Merging r4 through r9 into '.':
   C alice_folder/file2.txt
   C alice_folder/folder
Summary of conflicts:
  Tree conflicts: 2
[../svntest/app1/alice]% svn diff ^/app1/branches/alice/alice_folder/file2.txt ^/app1/trunk/alice_folder/file2.txt
[../svntest/app1/alice]% svn diff ^/app1/branches/alice/alice_folder/folder ^/app1/trunk/alice_folder/folder
[../svntest/app1/alice]% svn resolved alice_folder/file2.txt
Resolved conflicted state of 'alice_folder/file2.txt'
[../svntest/app1/alice]% svn resolved alice_folder/folder
Resolved conflicted state of 'alice_folder/folder'
[../svntest/app1/alice]% svn status
 M      .
[../svntest/app1/alice]% svn ci -m "Merge from trunk"
Sending        .
Committed revision 10.
[../svntest/app1/alice]% cd ..
[..v/test/svntest/app1]% (cd alice; svn update; svn merge --dry-run ^/app1/trunk)
At revision 10.
[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)
At revision 10.
[..v/test/svntest/app1]% cd bob
[..st/svntest/app1/bob]% svn update
At revision 10.
[..st/svntest/app1/bob]% svn merge --dry-run ^/app1/trunk
--- Merging r5 through r10 into '.':
A    alice_folder/file2.txt
A    alice_folder/folder
A    alice_folder/folder/file3.txt
U    alice_folder/file.txt
 U   .
[..st/svntest/app1/bob]% svn diff ^/app1/branches/bob ^/app1/trunk
Index: alice_folder/file2.txt
===================================================================
--- alice_folder/file2.txt	(.../branches/bob)	(revision 0)
+++ alice_folder/file2.txt	(.../trunk)	(revision 10)
@@ -0,0 +1 @@
+create in A.6
Index: alice_folder/folder/file3.txt
===================================================================
--- alice_folder/folder/file3.txt	(.../branches/bob)	(revision 0)
+++ alice_folder/folder/file3.txt	(.../trunk)	(revision 10)
@@ -0,0 +1 @@
+create folder in A.7
Index: alice_folder/file.txt
===================================================================
--- alice_folder/file.txt	(.../branches/bob)	(revision 10)
+++ alice_folder/file.txt	(.../trunk)	(revision 10)
@@ -1 +1,2 @@
 init rev.3
+modified in A.6
Index: bob_folder/file2.txt
===================================================================
--- bob_folder/file2.txt	(.../branches/bob)	(revision 10)
+++ bob_folder/file2.txt	(.../trunk)	(revision 10)
@@ -1 +0,0 @@
-create in B.8
Index: bob_folder/file.txt
===================================================================
--- bob_folder/file.txt	(.../branches/bob)	(revision 10)
+++ bob_folder/file.txt	(.../trunk)	(revision 10)
@@ -1,2 +1 @@
 init rev.3
-fugafuga B.8

Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
   Merged /app1/branches/alice:r4-8

[..st/svntest/app1/bob]% svn merge ^/app1/trunk
--- Merging r5 through r10 into '.':
A    alice_folder/file2.txt
A    alice_folder/folder
A    alice_folder/folder/file3.txt
U    alice_folder/file.txt
 U   .
[..st/svntest/app1/bob]% svn status
 M      .
A  +    alice_folder/file2.txt
A  +    alice_folder/folder
A  +    alice_folder/folder/file3.txt
M       alice_folder/file.txt
[..st/svntest/app1/bob]% svn ci -m "Merged from trunk"
Sending        .
Sending        alice_folder/file.txt
Adding         alice_folder/file2.txt
Adding         alice_folder/folder
Adding         alice_folder/folder/file3.txt
Transmitting file data .
Committed revision 11.
[..st/svntest/app1/bob]% cd ..
[..v/test/svntest/app1]% cd trunk
[../svntest/app1/trunk]% svn update
At revision 11.
[../svntest/app1/trunk]% svn mergeinfo ^/app1/branches/bob
[../svntest/app1/trunk]% svn merge --dry-run ^/app1/branches/bob
--- Merging r5 through r11 into '.':
   C alice_folder/file2.txt
   C alice_folder/folder
A    bob_folder/file2.txt
A    bob_folder/folder
A    bob_folder/folder/file3.txt
U    bob_folder/file.txt
 G   .
Summary of conflicts:
  Tree conflicts: 2
[../svntest/app1/trunk]% svn diff ^/app1/trunk ^/app1/branches/bob
Index: bob_folder/file2.txt
===================================================================
--- bob_folder/file2.txt	(.../trunk)	(revision 0)
+++ bob_folder/file2.txt	(.../branches/bob)	(revision 11)
@@ -0,0 +1 @@
+create in B.8
Index: bob_folder/folder/file3.txt
===================================================================
--- bob_folder/folder/file3.txt	(.../trunk)	(revision 0)
+++ bob_folder/folder/file3.txt	(.../branches/bob)	(revision 11)
@@ -0,0 +1 @@
+create folder in B.8
Index: bob_folder/file.txt
===================================================================
--- bob_folder/file.txt	(.../trunk)	(revision 11)
+++ bob_folder/file.txt	(.../branches/bob)	(revision 11)
@@ -1 +1,2 @@
 init rev.3
+fugafuga B.8

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /app1/trunk:r5-10

[../svntest/app1/trunk]% svn merge ^/app1/branches/bob
--- Merging r5 through r11 into '.':
   C alice_folder/file2.txt
   C alice_folder/folder
A    bob_folder/file2.txt
A    bob_folder/folder
A    bob_folder/folder/file3.txt
U    bob_folder/file.txt
 G   .
Summary of conflicts:
  Tree conflicts: 2
[../svntest/app1/trunk]% svn status
 M      .
      C alice_folder/file2.txt
      >   local add, incoming add upon merge
      C alice_folder/folder
      >   local add, incoming add upon merge
A  +    bob_folder/file2.txt
A  +    bob_folder/folder
A  +    bob_folder/folder/file3.txt
M       bob_folder/file.txt
[../svntest/app1/trunk]% svn diff ^/app1/trunk/alice_folder/file2.txt ^/app1/branches/bob/alice_folder/file2.txt
[../svntest/app1/trunk]% svn diff ^/app1/trunk/alice_folder/folder ^/app1/branches/bob/alice_folder/folder
[../svntest/app1/trunk]% svn resolved alice_folder/file2.txt
Resolved conflicted state of 'alice_folder/file2.txt'
[../svntest/app1/trunk]% svn resolved alice_folder/folder
Resolved conflicted state of 'alice_folder/folder'
[../svntest/app1/trunk]% svn status
 M      .
A  +    bob_folder/file2.txt
A  +    bob_folder/folder
A  +    bob_folder/folder/file3.txt
M       bob_folder/file.txt
[../svntest/app1/trunk]% svn ci -m "merge from bob"
Sending        .
Sending        bob_folder/file.txt
Adding         bob_folder/file2.txt
Adding         bob_folder/folder
Adding         bob_folder/folder/file3.txt
Transmitting file data .
Committed revision 12.
[../svntest/app1/trunk]% cd ..
[..v/test/svntest/app1]% (cd bob; svn update; svn merge --dry-run ^/app1/trunk)
At revision 12.
--- Merging r11 through r12 into '.':
   C bob_folder/file2.txt
   C bob_folder/folder
 G   .
Summary of conflicts:
  Tree conflicts: 2
[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/bob)
At revision 12.
[..v/test/svntest/app1]% cd trunk
[../svntest/app1/trunk]% cd ..
[..v/test/svntest/app1]% cd bob
[..st/svntest/app1/bob]% svn update
At revision 12.
[..st/svntest/app1/bob]% svn merge --dry-run ^/app1/trunk
--- Merging r11 through r12 into '.':
   C bob_folder/file2.txt
   C bob_folder/folder
 G   .
Summary of conflicts:
  Tree conflicts: 2
[..st/svntest/app1/bob]% svn diff ^/app1/branches/bob ^/app1/trunk

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /app1/trunk:r5-10
   Merged /app1/branches/bob:r5-11

[..st/svntest/app1/bob]% svn merge ^/app1/trunk
--- Merging r11 through r12 into '.':
   C bob_folder/file2.txt
   C bob_folder/folder
 G   .
Summary of conflicts:
  Tree conflicts: 2
[..st/svntest/app1/bob]% svn resolved bob_folder/file2.txt
Resolved conflicted state of 'bob_folder/file2.txt'
[..st/svntest/app1/bob]% svn resolved bob_folder/folder
Resolved conflicted state of 'bob_folder/folder'
[..st/svntest/app1/bob]% svn status
 M      .
[..st/svntest/app1/bob]% svn ci -m "merge from bob"
Sending        .

Committed revision 13.
[..st/svntest/app1/bob]% cd ..
[..v/test/svntest/app1]% (cd bob; svn update; svn merge --dry-run ^/app1/trunk)
At revision 13.
[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/bob)
At revision 13.
--- Merging r12 through r13 into '.':
 G   .
[..v/test/svntest/app1]% (cd alice; svn update; svn merge --dry-run ^/app1/trunk)
At revision 13.
[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)
At revision 13.

A    bob_folder/folder/file3.txt
U    bob_folder/file.txt
 G   .
[..v/test/svntest/app1]% cd alice
[../svntest/app1/alice]% svn update
At revision 13.
[../svntest/app1/alice]% svn merge --dry-run ^/app1/trunk
--- Merging r10 through r13 into '.':
A    bob_folder/file2.txt
A    bob_folder/folder
A    bob_folder/folder/file3.txt
U    bob_folder/file.txt
 G   .
[../svntest/app1/alice]% svn diff ^/app1/branches/alice ^/app1/trunk
Index: bob_folder/file2.txt
===================================================================
--- bob_folder/file2.txt	(.../branches/alice)	(revision 0)
+++ bob_folder/file2.txt	(.../trunk)	(revision 13)
@@ -0,0 +1 @@
+create in B.8
Index: bob_folder/folder/file3.txt
===================================================================
--- bob_folder/folder/file3.txt	(.../branches/alice)	(revision 0)
+++ bob_folder/folder/file3.txt	(.../trunk)	(revision 13)
@@ -0,0 +1 @@
+create folder in B.8
Index: bob_folder/file.txt
===================================================================
--- bob_folder/file.txt	(.../branches/alice)	(revision 13)
+++ bob_folder/file.txt	(.../trunk)	(revision 13)
@@ -1 +1,2 @@
 init rev.3
+fugafuga B.8

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /app1/trunk:r4-9
   Merged /app1/branches/alice:r4-8
   Merged /app1/branches/bob:r5-11

[../svntest/app1/alice]% svn merge ^/app1/trunk
--- Merging r10 through r13 into '.':
A    bob_folder/file2.txt
A    bob_folder/folder
A    bob_folder/folder/file3.txt
U    bob_folder/file.txt
 G   .
[../svntest/app1/alice]% svn status
 M      .
A  +    bob_folder/file2.txt
A  +    bob_folder/folder
A  +    bob_folder/folder/file3.txt
M       bob_folder/file.txt
[../svntest/app1/alice]% svn ci -m "merged from trunk in alice"
Sending        .
Sending        bob_folder/file.txt
Adding         bob_folder/file2.txt
Adding         bob_folder/folder
Adding         bob_folder/folder/file3.txt
Transmitting file data .
Committed revision 14.
[../svntest/app1/alice]% cd ..
[..v/test/svntest/app1]% (cd alice; svn update; svn merge --dry-run ^/app1/trunk)
At revision 14.
[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)
At revision 14.
--- Merging r9 through r14 into '.':
   C bob_folder/file2.txt
   C bob_folder/folder
 G   .
Summary of conflicts:
  Tree conflicts: 2
[..v/test/svntest/app1]% cd trunk
[../svntest/app1/trunk]% svn update
At revision 14.
[../svntest/app1/trunk]% svn merge --dry-run ^/app1/branches/alice
--- Merging r9 through r14 into '.':
   C bob_folder/file2.txt
   C bob_folder/folder
 G   .
Summary of conflicts:
  Tree conflicts: 2
[../svntest/app1/trunk]% svn merge ^/app1/branches/alice
--- Merging r9 through r14 into '.':
   C bob_folder/file2.txt
   C bob_folder/folder
 G   .
Summary of conflicts:
  Tree conflicts: 2
[../svntest/app1/trunk]% svn status
 M      .
      C bob_folder/file2.txt
      >   local add, incoming add upon merge
      C bob_folder/folder
      >   local add, incoming add upon merge
[../svntest/app1/trunk]% svn diff ^/app1/trunk ^/app1/branches/alice

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /app1/branches/alice:r4-8
   Merged /app1/trunk:r4-13

[../svntest/app1/trunk]% svn resolved bob_folder/file2.txt bob_folder/folder
Resolved conflicted state of 'bob_folder/file2.txt'
Resolved conflicted state of 'bob_folder/folder'
[../svntest/app1/trunk]% svn status
 M      .
[../svntest/app1/trunk]% svn ci -m "merge from alice"
Sending        .

Committed revision 15.
[../svntest/app1/trunk]% cd ..
[..v/test/svntest/app1]% (cd alice; svn update; svn merge --dry-run ^/app1/trunk)
At revision 15.
--- Merging r14 through r15 into '.':
 G   .
[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)
At revision 15.
[..v/test/svntest/app1]% (cd bob; svn update; svn merge --dry-run ^/app1/trunk)
At revision 15.
--- Merging r13 through r15 into '.':
 G   .
[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/bob)
At revision 15.
--- Merging r12 through r15 into '.':
 G   .
[..v/test/svntest/app1]% svn diff $SP/app1/trunk $SP/app1/branches/alice

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /app1/branches/alice:r4-14
   Merged /app1/trunk:r4-13

[..v/test/svntest/app1]% svn diff $SP/app1/trunk $SP/app1/branches/bob

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /app1/branches/alice:r9-14
   Reverse-merged /app1/branches/bob:r5-11
   Merged /app1/trunk:r5-12

[..v/test/svntest/app1]% svn mergeinfo $SP/app1/branches/alice  $SP/app1/trunk
r4
r6
r7
r10
r14
[..v/test/svntest/app1]% svn mergeinfo $SP/app1/branches/bob    $SP/app1/trunk
r5
r8
r11
[..v/test/svntest/app1]% cd alice
[../svntest/app1/alice]% svn update
At revision 15.
[../svntest/app1/alice]% STR=`echo "insert in A.16"; cat common_folder/file1.txt`; echo "$STR" > common_folder/file1.txt
[../svntest/app1/alice]% echo "modified in A & B" >> common_folder/file2.txt
[../svntest/app1/alice]% echo "insert in A.16" >> common_folder/file3.txt
[../svntest/app1/alice]% echo "create in A & B" >> common_folder/new_file1.txt
[../svntest/app1/alice]% echo "create in A.16" >> common_folder/new_file2.txt
[../svntest/app1/alice]% svn add common_folder/new_file1.txt common_folder/new_file2.txt
A         common_folder/new_file1.txt
A         common_folder/new_file2.txt
[../svntest/app1/alice]% mkdir common; echo "create folder in A.16" > common/file1.txt
[../svntest/app1/alice]% echo "create folder in A & B" > common/file2.txt
[../svntest/app1/alice]% mkdir other; echo "create folder in A.16" > other/file1.txt
[../svntest/app1/alice]% svn add common other
A         common
A         common/file1.txt
A         common/file2.txt
A         other
A         other/file1.txt
[../svntest/app1/alice]% svn status
A       other
A       other/file1.txt
M       common_folder/file2.txt
M       common_folder/file3.txt
A       common_folder/new_file1.txt
A       common_folder/new_file2.txt
M       common_folder/file1.txt
A       common
A       common/file2.txt
A       common/file1.txt
[../svntest/app1/alice]% svn diff
Index: other/file1.txt
===================================================================
--- other/file1.txt	(revision 0)
+++ other/file1.txt	(revision 0)
@@ -0,0 +1 @@
+create folder in A.16
Index: common_folder/file2.txt
===================================================================
--- common_folder/file2.txt	(revision 15)
+++ common_folder/file2.txt	(working copy)
@@ -1 +1,2 @@
 init rev.3
+modified in A & B
Index: common_folder/file3.txt
===================================================================
--- common_folder/file3.txt	(revision 15)
+++ common_folder/file3.txt	(working copy)
@@ -1 +1,2 @@
 init rev.3
+insert in A.16
Index: common_folder/new_file1.txt
===================================================================
--- common_folder/new_file1.txt	(revision 0)
+++ common_folder/new_file1.txt	(revision 0)
@@ -0,0 +1 @@
+create in A & B
Index: common_folder/new_file2.txt
===================================================================
--- common_folder/new_file2.txt	(revision 0)
+++ common_folder/new_file2.txt	(revision 0)
@@ -0,0 +1 @@
+create in A.16
Index: common_folder/file1.txt
===================================================================
--- common_folder/file1.txt	(revision 15)
+++ common_folder/file1.txt	(working copy)
@@ -1 +1,2 @@
+insert in A.16
 init rev.3
Index: common/file2.txt
===================================================================
--- common/file2.txt	(revision 0)
+++ common/file2.txt	(revision 0)
@@ -0,0 +1 @@
+create folder in A & B
Index: common/file1.txt
===================================================================
--- common/file1.txt	(revision 0)
+++ common/file1.txt	(revision 0)
@@ -0,0 +1 @@
+create folder in A.16
[../svntest/app1/alice]% svn ci -m "mod in alice"
Adding         common
Adding         common/file1.txt
Adding         common/file2.txt
Sending        common_folder/file1.txt
Sending        common_folder/file2.txt
Sending        common_folder/file3.txt
Adding         common_folder/new_file1.txt
Adding         common_folder/new_file2.txt
Adding         other
Adding         other/file1.txt
Transmitting file data ........
Committed revision 16.
[../svntest/app1/alice]% cd ..
[..v/test/svntest/app1]% cd bob
[..st/svntest/app1/bob]% svn update
At revision 16.
[..st/svntest/app1/bob]% echo "insert in B.17" >> common_folder/file1.txt
[..st/svntest/app1/bob]% echo "modified in A & B" >> common_folder/file2.txt
[..st/svntest/app1/bob]% echo "insert in B.17" >> common_folder/file3.txt
[..st/svntest/app1/bob]% echo "create in A & B" >> common_folder/new_file1.txt
[..st/svntest/app1/bob]% echo "create in B.17" >> common_folder/new_file2.txt
[..st/svntest/app1/bob]% svn add common_folder/new_file1.txt common_folder/new_file2.txt
A         common_folder/new_file1.txt
A         common_folder/new_file2.txt
[..st/svntest/app1/bob]% mkdir common; echo "create folder in B.17" > common/file1.txt
[..st/svntest/app1/bob]% echo "create folder in A & B" > common/file2.txt
[..st/svntest/app1/bob]% mkdir other; echo "create folder in B.17" > other/file2.txt
[..st/svntest/app1/bob]% svn add common other
A         common
A         common/file1.txt
A         common/file2.txt
A         other
A         other/file2.txt
[..st/svntest/app1/bob]% svn status
A       other
A       other/file2.txt
M       common_folder/file2.txt
M       common_folder/file3.txt
A       common_folder/new_file1.txt
A       common_folder/new_file2.txt
M       common_folder/file1.txt
A       common
A       common/file2.txt
A       common/file1.txt
[..st/svntest/app1/bob]% svn diff
Index: other/file2.txt
===================================================================
--- other/file2.txt	(revision 0)
+++ other/file2.txt	(revision 0)
@@ -0,0 +1 @@
+create folder in B.17
Index: common_folder/file2.txt
===================================================================
--- common_folder/file2.txt	(revision 16)
+++ common_folder/file2.txt	(working copy)
@@ -1 +1,2 @@
 init rev.3
+modified in A & B
Index: common_folder/file3.txt
===================================================================
--- common_folder/file3.txt	(revision 16)
+++ common_folder/file3.txt	(working copy)
@@ -1 +1,2 @@
 init rev.3
+insert in B.17
Index: common_folder/new_file1.txt
===================================================================
--- common_folder/new_file1.txt	(revision 0)
+++ common_folder/new_file1.txt	(revision 0)
@@ -0,0 +1 @@
+create in A & B
Index: common_folder/new_file2.txt
===================================================================
--- common_folder/new_file2.txt	(revision 0)
+++ common_folder/new_file2.txt	(revision 0)
@@ -0,0 +1 @@
+create in B.17
Index: common_folder/file1.txt
===================================================================
--- common_folder/file1.txt	(revision 16)
+++ common_folder/file1.txt	(working copy)
@@ -1 +1,2 @@
 init rev.3
+insert in B.17
Index: common/file2.txt
===================================================================
--- common/file2.txt	(revision 0)
+++ common/file2.txt	(revision 0)
@@ -0,0 +1 @@
+create folder in A & B
Index: common/file1.txt
===================================================================
--- common/file1.txt	(revision 0)
+++ common/file1.txt	(revision 0)
@@ -0,0 +1 @@
+create folder in B.17
[..st/svntest/app1/bob]% svn ci -m "mod in bob"
Adding         common
Adding         common/file1.txt
Adding         common/file2.txt
Sending        common_folder/file1.txt
Sending        common_folder/file2.txt
Sending        common_folder/file3.txt
Adding         common_folder/new_file1.txt
Adding         common_folder/new_file2.txt
Adding         other
Adding         other/file2.txt
Transmitting file data ........
Committed revision 17.
[..st/svntest/app1/bob]% cd ..
[..v/test/svntest/app1]% cd alice
[../svntest/app1/alice]% svn update
At revision 17.
[../svntest/app1/alice]% svn merge --dry-run ^/app1/trunk
--- Merging r14 through r17 into '.':
 G   .
[../svntest/app1/alice]% svn merge ^/app1/trunk
--- Merging r14 through r17 into '.':
 G   .
[../svntest/app1/alice]% svn status
 M      .
[../svntest/app1/alice]% svn ci -m "merged from trunk in alice"
Sending        .

Committed revision 18.
[../svntest/app1/alice]% cd ..
[..v/test/svntest/app1]% cd trunk
[../svntest/app1/trunk]% svn update
At revision 18.
[../svntest/app1/trunk]% svn merge --dry-run ^/app1/branches/alice
--- Merging r15 through r18 into '.':
A    other
A    other/file1.txt
U    common_folder/file2.txt
U    common_folder/file3.txt
A    common_folder/new_file1.txt
A    common_folder/new_file2.txt
U    common_folder/file1.txt
A    common
A    common/file2.txt
A    common/file1.txt
 G   .
[../svntest/app1/trunk]% svn diff ^/app1/trunk ^/app1/branches/alice
Index: other/file1.txt
===================================================================
--- other/file1.txt	(.../trunk)	(revision 0)
+++ other/file1.txt	(.../branches/alice)	(revision 18)
@@ -0,0 +1 @@
+create folder in A.16
Index: common_folder/file2.txt
===================================================================
--- common_folder/file2.txt	(.../trunk)	(revision 18)
+++ common_folder/file2.txt	(.../branches/alice)	(revision 18)
@@ -1 +1,2 @@
 init rev.3
+modified in A & B
Index: common_folder/file3.txt
===================================================================
--- common_folder/file3.txt	(.../trunk)	(revision 18)
+++ common_folder/file3.txt	(.../branches/alice)	(revision 18)
@@ -1 +1,2 @@
 init rev.3
+insert in A.16
Index: common_folder/new_file1.txt
===================================================================
--- common_folder/new_file1.txt	(.../trunk)	(revision 0)
+++ common_folder/new_file1.txt	(.../branches/alice)	(revision 18)
@@ -0,0 +1 @@
+create in A & B
Index: common_folder/new_file2.txt
===================================================================
--- common_folder/new_file2.txt	(.../trunk)	(revision 0)
+++ common_folder/new_file2.txt	(.../branches/alice)	(revision 18)
@@ -0,0 +1 @@
+create in A.16
Index: common_folder/file1.txt
===================================================================
--- common_folder/file1.txt	(.../trunk)	(revision 18)
+++ common_folder/file1.txt	(.../branches/alice)	(revision 18)
@@ -1 +1,2 @@
+insert in A.16
 init rev.3
Index: common/file2.txt
===================================================================
--- common/file2.txt	(.../trunk)	(revision 0)
+++ common/file2.txt	(.../branches/alice)	(revision 18)
@@ -0,0 +1 @@
+create folder in A & B
Index: common/file1.txt
===================================================================
--- common/file1.txt	(.../trunk)	(revision 0)
+++ common/file1.txt	(.../branches/alice)	(revision 18)
@@ -0,0 +1 @@
+create folder in A.16

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /app1/branches/alice:r4-14
   Merged /app1/trunk:r4-17

[../svntest/app1/trunk]% svn merge ^/app1/branches/alice
--- Merging r15 through r18 into '.':
A    other
A    other/file1.txt
U    common_folder/file2.txt
U    common_folder/file3.txt
A    common_folder/new_file1.txt
A    common_folder/new_file2.txt
U    common_folder/file1.txt
A    common
A    common/file2.txt
A    common/file1.txt
 G   .
[../svntest/app1/trunk]% svn status
 M      .
A  +    other
A  +    other/file1.txt
M       common_folder/file2.txt
M       common_folder/file3.txt
A  +    common_folder/new_file1.txt
A  +    common_folder/new_file2.txt
M       common_folder/file1.txt
A  +    common
A  +    common/file2.txt
A  +    common/file1.txt
[../svntest/app1/trunk]% svn ci -m "merged from alice"
Sending        .
Adding         common
Adding         common/file1.txt
Adding         common/file2.txt
Sending        common_folder/file1.txt
Sending        common_folder/file2.txt
Sending        common_folder/file3.txt
Adding         common_folder/new_file1.txt
Adding         common_folder/new_file2.txt
Adding         other
Adding         other/file1.txt
Transmitting file data ...
Committed revision 19.
[../svntest/app1/trunk]% cd ..
[..v/test/svntest/app1]% cd alice
[../svntest/app1/alice]% svn update
At revision 19.
[../svntest/app1/alice]% svn merge --dry-run ^/app1/trunk
--- Merging r18 through r19 into '.':
   C other
   C common_folder/new_file1.txt
   C common_folder/new_file2.txt
   C common
 G   .
Summary of conflicts:
  Tree conflicts: 4

[../svntest/app1/alice]% svn diff ^/app1/branches/alice ^/app1/trunks

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /app1/trunk:r4-17
   Merged /app1/branches/alice:r4-18

[../svntest/app1/alice]% svn merge ^/app1/trunk
--- Merging r18 through r19 into '.':
   C other
   C common_folder/new_file1.txt
   C common_folder/new_file2.txt
   C common
 G   .
Summary of conflicts:
  Tree conflicts: 4
[../svntest/app1/alice]% svn status
 M      .
      C other
      >   local add, incoming add upon merge
      C common_folder/new_file1.txt
      >   local add, incoming add upon merge
      C common_folder/new_file2.txt
      >   local add, incoming add upon merge
      C common
      >   local add, incoming add upon merge
[../svntest/app1/alice]% svn resolved common_folder/new_file1.txt common_folder/new_file2.txt
Resolved conflicted state of 'common_folder/new_file1.txt'
Resolved conflicted state of 'common_folder/new_file2.txt'
[../svntest/app1/alice]% svn resolved common other
Resolved conflicted state of 'common'
Resolved conflicted state of 'other'
[../svntest/app1/alice]% svn status
 M      .
[../svntest/app1/alice]% svn ci -m "merged from trunk in alice"
Sending        .

Committed revision 20.
[../svntest/app1/alice]% cd ..
[..v/test/svntest/app1]% (cd alice; svn update; svn merge --dry-run ^/app1/trunk)
At revision 20.
[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)
At revision 20.
--- Merging r19 through r20 into '.':
 G   .
[..v/test/svntest/app1]% svn blame $SP/app1/trunk/common_folder/file1.txt
    19       namu insert in A.16
     3       namu init rev.3
[..v/test/svntest/app1]% svn blame -g $SP/app1/trunk/common_folder/file1.txt
G     16       namu insert in A.16
       3       namu init rev.3
namu@namumac:[..v/test/svntest/app1]% cd bob
namu@namumac:[..st/svntest/app1/bob]% svn update
At revision 20.
namu@namumac:[..st/svntest/app1/bob]% svn merge --dry-run ^/app1/trunk
--- Merging r13 through r20 into '.':
   C other
C    common_folder/file3.txt
   C common_folder/new_file1.txt
   C common_folder/new_file2.txt
U    common_folder/file1.txt
   C common
 G   .
Summary of conflicts:
  Text conflicts: 1
  Tree conflicts: 4
namu@namumac:[..st/svntest/app1/bob]% svn mergeinfo ^/app1/trunk
r9
r12
namu@namumac:[..st/svntest/app1/bob]% svn mergeinfo ^/app1/trunk --show-revs eligible
r15
r19
namu@namumac:[..st/svntest/app1/bob]% svn merge ^/app1/trunk
--- Merging r13 through r20 into '.':
   C other
Conflict discovered in 'common_folder/file3.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: df
--- /var/folders/3-/3-u-bpQtGfC7MCOdLqhqIE+++TI/-Tmp-/tempfile.2.tmp	日  5  1 21:47:50 2011
+++ common_folder/.svn/tmp/file3.txt.2.tmp	日  5  1 21:47:50 2011
@@ -1 +1,6 @@
 init rev.3
+<<<<<<< .working
+insert in B.17
+=======
+insert in A.16
+>>>>>>> .merge-right.r20
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    common_folder/file3.txt
   C common_folder/new_file1.txt
   C common_folder/new_file2.txt
U    common_folder/file1.txt
   C common
 G   .
Summary of conflicts:
  Text conflicts: 1
  Tree conflicts: 4
namu@namumac:[..st/svntest/app1/bob]% STR=`grep -v "^[<=>]" common_folder/file3.txt`; echo "$STR" > common_folder/file3.txt
namu@namumac:[..st/svntest/app1/bob]% svn diff common_folder/file3.txt
Index: common_folder/file3.txt
===================================================================
--- common_folder/file3.txt	(revision 20)
+++ common_folder/file3.txt	(working copy)
@@ -1,2 +1,3 @@
 init rev.3
 insert in B.17
+insert in A.16
namu@namumac:[..st/svntest/app1/bob]% svn resolved common_folder/file3.txt
Resolved conflicted state of 'common_folder/file3.txt'
namu@namumac:[..st/svntest/app1/bob]% svn diff ^/app1/branches/bob/common_folder/new_file1.txt ^/app1/trunk/common_folder/new_file1.txt
namu@namumac:[..st/svntest/app1/bob]% svn resolved common_folder/new_file1.txt
Resolved conflicted state of 'common_folder/new_file1.txt'
namu@namumac:[..st/svntest/app1/bob]% svn diff ^/app1/branches/bob/common_folder/new_file2.txt ^/app1/trunk/common_folder/new_file2.txt
Index: new_file2.txt
===================================================================
--- new_file2.txt	(.../branches/bob/common_folder/new_file2.txt)	(revision 20)
+++ new_file2.txt	(.../trunk/common_folder/new_file2.txt)	(revision 20)
@@ -1 +1 @@
-create in B.17
+create in A.16
namu@namumac:[..st/svntest/app1/bob]% svn cat ^/app1/trunk/common_folder/new_file2.txt >> common_folder/new_file2.txt
namu@namumac:[..st/svntest/app1/bob]% svn diff common_folder/new_file2.txt
Index: common_folder/new_file2.txt
===================================================================
--- common_folder/new_file2.txt	(revision 20)
+++ common_folder/new_file2.txt	(working copy)
@@ -1 +1,2 @@
 create in B.17
+create in A.16
namu@namumac:[..st/svntest/app1/bob]% svn resolved common_folder/new_file2.txt
Resolved conflicted state of 'common_folder/new_file2.txt'
namu@namumac:[..st/svntest/app1/bob]% svn diff ^/app1/branches/bob/common ^/app1/trunk/common
Index: file1.txt
===================================================================
--- file1.txt	(.../branches/bob/common)	(revision 20)
+++ file1.txt	(.../trunk/common)	(revision 20)
@@ -1 +1 @@
-create folder in B.17
+create folder in A.16
namu@namumac:[..st/svntest/app1/bob]% svn cat ^/app1/trunk/common/file1.txt >> common/file1.txt
namu@namumac:[..st/svntest/app1/bob]% svn diff common
Index: common/file1.txt
===================================================================
--- common/file1.txt	(revision 20)
+++ common/file1.txt	(working copy)
@@ -1 +1,2 @@
 create folder in B.17
+create folder in A.16
namu@namumac:[..st/svntest/app1/bob]% svn resolved common
Resolved conflicted state of 'common'
namu@namumac:[..st/svntest/app1/bob]% svn diff ^/app1/branches/bob/other ^/app1/trunk/other
Index: file2.txt
===================================================================
--- file2.txt	(.../branches/bob/other)	(revision 20)
+++ file2.txt	(.../trunk/other)	(revision 20)
@@ -1 +0,0 @@
-create folder in B.17
Index: file1.txt
===================================================================
--- file1.txt	(.../branches/bob/other)	(revision 0)
+++ file1.txt	(.../trunk/other)	(revision 20)
@@ -0,0 +1 @@
+create folder in A.16
namu@namumac:[..st/svntest/app1/bob]% svn cat ^/app1/trunk/other/file1.txt > other/file1.txt
namu@namumac:[..st/svntest/app1/bob]% svn add other/file1.txt
A         other/file1.txt
namu@namumac:[..st/svntest/app1/bob]% svn resolved other
Resolved conflicted state of 'other'
namu@namumac:[..st/svntest/app1/bob]% svn diff

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /app1/branches/alice:r9-18
   Merged /app1/trunk:r13-20

Index: other/file1.txt
===================================================================
--- other/file1.txt	(revision 0)
+++ other/file1.txt	(revision 0)
@@ -0,0 +1 @@
+create folder in A.16
Index: common_folder/file3.txt
===================================================================
--- common_folder/file3.txt	(revision 20)
+++ common_folder/file3.txt	(working copy)
@@ -1,2 +1,3 @@
 init rev.3
 insert in B.17
+insert in A.16
Index: common_folder/new_file2.txt
===================================================================
--- common_folder/new_file2.txt	(revision 20)
+++ common_folder/new_file2.txt	(working copy)
@@ -1 +1,2 @@
 create in B.17
+create in A.16
Index: common_folder/file1.txt
===================================================================
--- common_folder/file1.txt	(revision 20)
+++ common_folder/file1.txt	(working copy)
@@ -1,2 +1,3 @@
+insert in A.16
 init rev.3
 insert in B.17
Index: common/file1.txt
===================================================================
--- common/file1.txt	(revision 20)
+++ common/file1.txt	(working copy)
@@ -1 +1,2 @@
 create folder in B.17
+create folder in A.16
namu@namumac:[..st/svntest/app1/bob]% svn status
 M      .
A       other/file1.txt
M       common_folder/file3.txt
M       common_folder/new_file2.txt
M       common_folder/file1.txt
M       common/file1.txt
namu@namumac:[..st/svntest/app1/bob]% svn ci -m "merge from trunk in bob"
Sending        .
Sending        common/file1.txt
Sending        common_folder/file1.txt
Sending        common_folder/file3.txt
Sending        common_folder/new_file2.txt
Adding         other/file1.txt
Transmitting file data .....
Committed revision 21.
namu@namumac:[..st/svntest/app1/bob]% cd ..
namu@namumac:[..v/test/svntest/app1]% cd trunk
namu@namumac:[../svntest/app1/trunk]% svn update
At revision 21.
svn mergeinfo ^/app1/branches/bob
namu@namumac:[../svntest/app1/trunk]% svn mergeinfo ^/app1/branches/bobs
r5
r8
r11
namu@namumac:[../svntest/app1/trunk]% svn merge --dry-run ^/app1/branches/bob
--- Merging r12 through r21 into '.':
   C other
C    common_folder/file3.txt
   C common_folder/new_file1.txt
   C common_folder/new_file2.txt
U    common_folder/file1.txt
   C common
 G   .
Summary of conflicts:
  Text conflicts: 1
  Tree conflicts: 4
namu@namumac:[../svntest/app1/trunk]% svn diff ^/app1/trunk ^/app1/branches/bob
Index: other/file2.txt
===================================================================
--- other/file2.txt	(.../trunk)	(revision 0)
+++ other/file2.txt	(.../branches/bob)	(revision 21)
@@ -0,0 +1 @@
+create folder in B.17
Index: common_folder/file3.txt
===================================================================
--- common_folder/file3.txt	(.../trunk)	(revision 21)
+++ common_folder/file3.txt	(.../branches/bob)	(revision 21)
@@ -1,2 +1,3 @@
 init rev.3
+insert in B.17
 insert in A.16
Index: common_folder/new_file2.txt
===================================================================
--- common_folder/new_file2.txt	(.../trunk)	(revision 21)
+++ common_folder/new_file2.txt	(.../branches/bob)	(revision 21)
@@ -1 +1,2 @@
+create in B.17
 create in A.16
Index: common_folder/file1.txt
===================================================================
--- common_folder/file1.txt	(.../trunk)	(revision 21)
+++ common_folder/file1.txt	(.../branches/bob)	(revision 21)
@@ -1,2 +1,3 @@
 insert in A.16
 init rev.3
+insert in B.17
Index: common/file1.txt
===================================================================
--- common/file1.txt	(.../trunk)	(revision 21)
+++ common/file1.txt	(.../branches/bob)	(revision 21)
@@ -1 +1,2 @@
+create folder in B.17
 create folder in A.16

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /app1/branches/bob:r5-11
   Merged /app1/trunk:r5-20

namu@namumac:[../svntest/app1/trunk]% svn merge  ^/app1/branches/bob
--- Merging r12 through r21 into '.':
   C other
Conflict discovered in 'common_folder/file3.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: df
--- /var/folders/3-/3-u-bpQtGfC7MCOdLqhqIE+++TI/-Tmp-/tempfile.2.tmp	日  5  1 21:49:19 2011
+++ common_folder/.svn/tmp/file3.txt.4.tmp	日  5  1 21:49:19 2011
@@ -1 +1,7 @@
 init rev.3
+<<<<<<< .working
+insert in A.16
+=======
+insert in B.17
+insert in A.16
+>>>>>>> .merge-right.r21
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: tc
U    common_folder/file3.txt
   C common_folder/new_file1.txt
   C common_folder/new_file2.txt
U    common_folder/file1.txt
   C common
 G   .
Summary of conflicts:
  Tree conflicts: 4
namu@namumac:[../svntest/app1/trunk]% svn diff ^/app1/trunk/common_folder/new_file1.txt ^/app1/branches/bob/common_folder/new_file1.txt
namu@namumac:[../svntest/app1/trunk]% svn resolved common_folder/new_file1.txt
Resolved conflicted state of 'common_folder/new_file1.txt'
namu@namumac:[../svntest/app1/trunk]% svn diff ^/app1/trunk/common_folder/new_file2.txt ^/app1/branches/bob/common_folder/new_file2.txt
Index: new_file2.txt
===================================================================
--- new_file2.txt	(.../trunk/common_folder/new_file2.txt)	(revision 21)
+++ new_file2.txt	(.../branches/bob/common_folder/new_file2.txt)	(revision 21)
@@ -1 +1,2 @@
+create in B.17
 create in A.16
namu@namumac:[../svntest/app1/trunk]% svn cat ^/app1/branches/bob/common_folder/new_file2.txt > common_folder/new_file2.txt
namu@namumac:[../svntest/app1/trunk]% svn resolved common_folder/new_file2.txt
Resolved conflicted state of 'common_folder/new_file2.txt'
namu@namumac:[../svntest/app1/trunk]% svn diff ^/app1/trunk/common ^/app1/branches/bob/common
Index: file1.txt
===================================================================
--- file1.txt	(.../trunk/common)	(revision 21)
+++ file1.txt	(.../branches/bob/common)	(revision 21)
@@ -1 +1,2 @@
+create folder in B.17
 create folder in A.16
namu@namumac:[../svntest/app1/trunk]% svn cat ^/app1/branches/bob/common/file1.txt > common/file1.txt
namu@namumac:[../svntest/app1/trunk]% svn resolved common
Resolved conflicted state of 'common'
namu@namumac:[../svntest/app1/trunk]% svn diff ^/app1/trunk/other ^/app1/branches/bob/other
Index: file2.txt
===================================================================
--- file2.txt	(.../trunk/other)	(revision 0)
+++ file2.txt	(.../branches/bob/other)	(revision 21)
@@ -0,0 +1 @@
+create folder in B.17
namu@namumac:[../svntest/app1/trunk]% svn cat ^/app1/branches/bob/other/file2.txt > other/file2.txt
namu@namumac:[../svntest/app1/trunk]% svn resolved other
Resolved conflicted state of 'other'
namu@namumac:[../svntest/app1/trunk]% svn add other/file2.txt
A         other/file2.txt
namu@namumac:[../svntest/app1/trunk]% svn status
 M      .
A       other/file2.txt
M       common_folder/file3.txt
M       common_folder/new_file2.txt
M       common_folder/file1.txt
M       common/file1.txt
namu@namumac:[../svntest/app1/trunk]%
namu@namumac:[../svntest/app1/trunk]% svn diff

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /app1/branches/bob:r12-21

Index: other/file2.txt
===================================================================
--- other/file2.txt	(revision 0)
+++ other/file2.txt	(revision 0)
@@ -0,0 +1 @@
+create folder in B.17
Index: common_folder/file3.txt
===================================================================
--- common_folder/file3.txt	(revision 21)
+++ common_folder/file3.txt	(working copy)
@@ -1,2 +1,3 @@
 init rev.3
+insert in B.17
 insert in A.16
Index: common_folder/new_file2.txt
===================================================================
--- common_folder/new_file2.txt	(revision 21)
+++ common_folder/new_file2.txt	(working copy)
@@ -1 +1,2 @@
+create in B.17
 create in A.16
Index: common_folder/file1.txt
===================================================================
--- common_folder/file1.txt	(revision 21)
+++ common_folder/file1.txt	(working copy)
@@ -1,2 +1,3 @@
 insert in A.16
 init rev.3
+insert in B.17
Index: common/file1.txt
===================================================================
--- common/file1.txt	(revision 21)
+++ common/file1.txt	(working copy)
@@ -1 +1,2 @@
+create folder in B.17
 create folder in A.16
namu@namumac:[../svntest/app1/trunk]% svn ci -m "merge from bob"
Sending        .
Sending        common/file1.txt
Sending        common_folder/file1.txt
Sending        common_folder/file3.txt
Sending        common_folder/new_file2.txt
Adding         other/file2.txt
.Transmitting file data ....
Committed revision 22.
namu@namumac:[../svntest/app1/trunk]% cd ..
namu@namumac:[..v/test/svntest/app1]% cd bob
namu@namumac:[..st/svntest/app1/bob]% svn update
At revision 22.
namu@namumac:[..st/svntest/app1/bob]% svn merge --dry-run ^/app1/trunk
--- Merging r21 through r22 into '.':
   C other/file2.txt
 G   .
Summary of conflicts:
  Tree conflicts: 1
namu@namumac:[..st/svntest/app1/bob]% svn merge ^/app1/trunk
--- Merging r21 through r22 into '.':
   C other/file2.txt
 G   .
Summary of conflicts:
  Tree conflicts: 1
namu@namumac:[..st/svntest/app1/bob]% svn diff ^/app1/branches/bob/other/file2.txt ^/app1/trunk/other/file2.txt
namu@namumac:[..st/svntest/app1/bob]% svn resolved other/file2.txt
Resolved conflicted state of 'other/file2.txt'
namu@namumac:[..st/svntest/app1/bob]% svn status
 M      .
namu@namumac:[..st/svntest/app1/bob]% svn diff

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /app1/trunk:r21-22

namu@namumac:[..st/svntest/app1/bob]% svn ci -m "merge from trunk"
Sending        .

Committed revision 23.
namu@namumac:[..st/svntest/app1/bob]% cd ..
namu@namumac:[..v/test/svntest/app1]% (cd bob; svn update; svn merge --dry-run ^/app1/trunk)
At revision 23.
namu@namumac:[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/bob)
At revision 23.
--- Merging r22 through r23 into '.':
 G   .
namu@namumac:[..v/test/svntest/app1]% cd alice
namu@namumac:[../svntest/app1/alice]% svn update
At revision 23.
namu@namumac:[../svntest/app1/alice]% svn mergeinfo ^/app1/trunk
r9
r12
r15
r19
namu@namumac:[../svntest/app1/alice]% svn merge --dry-run ^/app1/trunk
--- Merging r20 through r23 into '.':
A    other/file2.txt
U    common_folder/file3.txt
U    common_folder/new_file2.txt
U    common_folder/file1.txt
U    common/file1.txt
 G   .
namu@namumac:[../svntest/app1/alice]% svn merge ^/app1/trunk
--- Merging r20 through r23 into '.':
A    other/file2.txt
U    common_folder/file3.txt
U    common_folder/new_file2.txt
U    common_folder/file1.txt
U    common/file1.txt
 G   .
namu@namumac:[../svntest/app1/alice]% svn status
 M      .
A  +    other/file2.txt
M       common_folder/file3.txt
M       common_folder/new_file2.txt
M       common_folder/file1.txt
M       common/file1.txt
namu@namumac:[../svntest/app1/alice]% svn diff

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /app1/trunk:r20-23
   Merged /app1/branches/bob:r12-21

Index: common_folder/file3.txt
===================================================================
--- common_folder/file3.txt	(revision 23)
+++ common_folder/file3.txt	(working copy)
@@ -1,2 +1,3 @@
 init rev.3
+insert in B.17
 insert in A.16
Index: common_folder/new_file2.txt
===================================================================
--- common_folder/new_file2.txt	(revision 23)
+++ common_folder/new_file2.txt	(working copy)
@@ -1 +1,2 @@
+create in B.17
 create in A.16
Index: common_folder/file1.txt
===================================================================
--- common_folder/file1.txt	(revision 23)
+++ common_folder/file1.txt	(working copy)
@@ -1,2 +1,3 @@
 insert in A.16
 init rev.3
+insert in B.17
Index: common/file1.txt
===================================================================
--- common/file1.txt	(revision 23)
+++ common/file1.txt	(working copy)
@@ -1 +1,2 @@
+create folder in B.17
 create folder in A.16
namu@namumac:[../svntest/app1/alice]% svn ci -m "merge from trunk"
Sending        .
Sending        common/file1.txt
Sending        common_folder/file1.txt
Sending        common_folder/file3.txt
Sending        common_folder/new_file2.txt
Adding         other/file2.txt
...Transmitting file data .
Committed revision 24.
namu@namumac:[../svntest/app1/alice]% cd ..
namu@namumac:[..v/test/svntest/app1]% (cd alice; svn update; svn merge --dry-run ^/app1/trunk)
At revision 24.
namu@namumac:[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)
At revision 24.
--- Merging r19 through r24 into '.':
   C other/file2.txt
 G   .
Summary of conflicts:
  Tree conflicts: 1
namu@namumac:[..v/test/svntest/app1]% cd trunk
namu@namumac:[../svntest/app1/trunk]% svn update
At revision 24.
namu@namumac:[../svntest/app1/trunk]% svn merge --dry-run ^/app1/branches/alice
--- Merging r19 through r24 into '.':
   C other/file2.txt
 G   .
Summary of conflicts:
  Tree conflicts: 1
namu@namumac:[../svntest/app1/trunk]% svn diff ^/app1/trunk ^/app1/branches/alice

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /app1/branches/alice:r4-18
   Merged /app1/trunk:r4-23

namu@namumac:[../svntest/app1/trunk]% svn merge ^/app1/branches/alice
--- Merging r19 through r24 into '.':
   C other/file2.txt
 G   .
Summary of conflicts:
  Tree conflicts: 1
namu@namumac:[../svntest/app1/trunk]% svn diff ^/app1/trunk/other/file2.txt ^/app1/branches/alice/other/file2.txt
namu@namumac:[../svntest/app1/trunk]% svn resolved other/file2.txt
Resolved conflicted state of 'other/file2.txt'
namu@namumac:[../svntest/app1/trunk]% svn status
 M      .
namu@namumac:[../svntest/app1/trunk]% svn ci -m "merged from alice"
Sending        .

Committed revision 25.
namu@namumac:[../svntest/app1/trunk]% cd ..
namu@namumac:[..v/test/svntest/app1]% (cd alice; svn update; svn merge --dry-run ^/app1/trunk)
At revision 25.
--- Merging r24 through r25 into '.':
 G   .
namu@namumac:[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)
At revision 25.
namu@namumac:[..v/test/svntest/app1]% cd alice
namu@namumac:[../svntest/app1/alice]% svn update
At revision 25.
namu@namumac:[../svntest/app1/alice]% svn mergeinfo ^/app1/trunk
r9
r12
r15
r19
r22
namu@namumac:[../svntest/app1/alice]% svn merge --dry-run ^/app1/trunk
--- Merging r24 through r25 into '.':
 G   .
namu@namumac:[../svntest/app1/alice]% svn merge ^/app1/trunk
--- Merging r24 through r25 into '.':
 G   .
namu@namumac:[../svntest/app1/alice]% svn status
 M      .
namu@namumac:[../svntest/app1/alice]% svn diff

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /app1/trunk:r24-25

namu@namumac:[../svntest/app1/alice]% svn ci -m "merge from trunk"
Sending        .

Committed revision 26.
namu@namumac:[../svntest/app1/alice]% cd ..
namu@namumac:[..v/test/svntest/app1]% (cd alice; svn update; svn merge --dry-run ^/app1/trunk)
At revision 26.
namu@namumac:[..v/test/svntest/app1]% (cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)
At revision 26.
--- Merging r25 through r26 into '.':
 G   .
namu@namumac:[..v/test/svntest/app1]% svn diff $SP/app1/trunk $SP/app1/branches/alice

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /app1/branches/alice:r4-24
   Merged /app1/trunk:r4-25

namu@namumac:[..v/test/svntest/app1]% svn diff $SP/app1/trunk $SP/app1/branches/bob

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /app1/branches/alice:r19-24
   Reverse-merged /app1/branches/bob:r5-21
   Merged /app1/trunk:r5-22

svn_exam.sh

#============================================
# 初期セットアップ
#============================================

export SP=file://${HOME}/dev/test/svntest/repos

svnadmin create repos
svn mkdir $SP/app1 -m "create app1"
svn mkdir $SP/app1/trunk $SP/app1/branches $SP/app1/tags -m "init"
svn ls $SP/app1

mkdir -p app1/trunk app1/alice app1/bob

cd app1/trunk
svn co $SP/app1/trunk .

mkdir common_folder alice_folder bob_folder
echo "init rev.3" > common_folder/file1.txt
echo "init rev.3" > common_folder/file2.txt
echo "init rev.3" > common_folder/file3.txt
echo "init rev.3" > alice_folder/file.txt
echo "init rev.3" > bob_folder/file.txt

svn add *
svn status
svn ci -m "add initial files"
# rev 3
cd ..

svn cp $SP/app1/trunk $SP/app1/branches/alice -m "copy to alice"
# rev 4
svn cp $SP/app1/trunk $SP/app1/branches/bob -m "copy to bob"
# rev 5
#============================================


#============================================
# 違うファイルを編集
#============================================

cd alice
svn co $SP/app1/branches/alice .

echo "modified in A.6" >> alice_folder/file.txt
echo "create in A.6" >> alice_folder/file2.txt
svn add alice_folder/file2.txt
svn status
svn ci -m "mod in alice"
#rev 6
mkdir alice_folder/folder; echo "create folder in A.7" >> alice_folder/folder/file3.txt
svn add alice_folder/folder
svn status
svn ci -m "mod in alice"
#rev 7

cd ..

cd bob
svn co $SP/app1/branches/bob .

echo "fugafuga B.8" >> bob_folder/file.txt
echo "create in B.8" >> bob_folder/file2.txt
svn add bob_folder/file2.txt
mkdir bob_folder/folder
echo "create folder in B.8" >> bob_folder/folder/file3.txt
svn add bob_folder/folder
svn status
svn ci -m "mod in bob"
# rev 8

cd ..

# alice -> trunk のマージ (rev.6-7)
cd trunk
svn update

svn diff ^/app1/trunk ^/app1/branches/alice
svn merge --dry-run ^/app1/branches/alice
svn merge ^/app1/branches/alice
svn status
svn ci -m "Merged from alice"
# ref 9

cd ..

# trunk -> alice （マージ結果を受け取る)
cd alice
svn update

svn merge --dry-run ^/app1/trunk
# マージ後を状態を受け取るので、相手を完全受領
svn merge --accept theirs-full ^/app1/trunk
svn diff ^/app1/branches/alice/alice_folder/file2.txt ^/app1/trunk/alice_folder/file2.txt
svn diff ^/app1/branches/alice/alice_folder/folder ^/app1/trunk/alice_folder/folder
svn resolved alice_folder/file2.txt
svn resolved alice_folder/folder
svn status
svn ci -m "Merge from trunk"
# rev.10
cd ..
# マージ漏れが内ことを確認
(cd alice; svn update; svn merge --dry-run ^/app1/trunk)
(cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)




# trunk -> bob のマージ( alice rev.6-7 )
cd bob
svn update

svn merge --dry-run ^/app1/trunk
svn diff ^/app1/branches/bob ^/app1/trunk
svn merge ^/app1/trunk
svn status
svn ci -m "Merged from trunk"
# rev 11

cd ..

# bob -> trunk のマージ (bob rev.8)
cd trunk
svn update

svn mergeinfo ^/app1/branches/bob
svn merge --dry-run ^/app1/branches/bob
svn diff ^/app1/trunk ^/app1/branches/bob
svn merge ^/app1/branches/bob
svn status
svn diff ^/app1/trunk/alice_folder/file2.txt ^/app1/branches/bob/alice_folder/file2.txt
svn diff ^/app1/trunk/alice_folder/folder ^/app1/branches/bob/alice_folder/folder
svn resolved alice_folder/file2.txt
svn resolved alice_folder/folder
svn status
svn ci -m "merge from bob"
# rev 12

cd ..


(cd bob; svn update; svn merge --dry-run ^/app1/trunk)
(cd trunk; svn update; svn merge --dry-run ^/app1/branches/bob)

# bob_folderがコンフリクト

# trunk -> bob
cd bob
svn update
svn merge --dry-run ^/app1/trunk
svn diff ^/app1/branches/bob ^/app1/trunk
svn merge ^/app1/trunk
svn resolved bob_folder/file2.txt
svn resolved bob_folder/folder
svn status
svn ci -m "merge from bob"
# rev.13
cd ..

(cd bob; svn update; svn merge --dry-run ^/app1/trunk)
(cd trunk; svn update; svn merge --dry-run ^/app1/branches/bob)


# trunk -> alice ( bob rev.8 を受け取る )
cd alice
svn update

svn merge --dry-run ^/app1/trunk
svn diff ^/app1/branches/alice ^/app1/trunk
svn merge ^/app1/trunk
svn status
svn ci -m "merged from trunk in alice"
# rev 14
cd ..
(cd alice; svn update; svn merge --dry-run ^/app1/trunk)
(cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)

cd trunk
svn update
svn merge --dry-run ^/app1/branches/alice
svn merge ^/app1/branches/alice
svn status
svn diff ^/app1/trunk ^/app1/branches/alice
svn resolved bob_folder/file2.txt bob_folder/folder
svn status
svn ci -m "merge from alice"
# rev.15
cd ..

(cd alice; svn update; svn merge --dry-run ^/app1/trunk)
(cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)
(cd bob; svn update; svn merge --dry-run ^/app1/trunk)
(cd trunk; svn update; svn merge --dry-run ^/app1/branches/bob)

#============================================

# 差が無いはず
svn diff $SP/app1/trunk $SP/app1/branches/alice
svn diff $SP/app1/trunk $SP/app1/branches/bob
svn mergeinfo $SP/app1/branches/alice  $SP/app1/trunk
svn mergeinfo $SP/app1/branches/bob    $SP/app1/trunk


#============================================
# 同じファイルを編集
#============================================

cd alice
svn update

# 同じファイルの別の箇所を編集
STR=`echo "insert in A.16"; cat common_folder/file1.txt`; echo "$STR" > common_folder/file1.txt

# 同じファイルの同じ箇所を編集# 同じ内容
echo "modified in A & B" >> common_folder/file2.txt
# 同じファイルの同じ箇所を編集# 違う内容
echo "insert in A.16" >> common_folder/file3.txt

# 同じファイルを新規追加# 同じ内容
echo "create in A & B" >> common_folder/new_file1.txt
# 同じファイルを新規追加# 違う内容
echo "create in A.16" >> common_folder/new_file2.txt
svn add common_folder/new_file1.txt common_folder/new_file2.txt

# 同じフォルダを新規追加 # 中のファイルも同じ
mkdir common; echo "create folder in A.16" > common/file1.txt
echo "create folder in A & B" > common/file2.txt
# 同じフォルダを新規追加 # フォルダは同じでファイルは違う
mkdir other; echo "create folder in A.16" > other/file1.txt
svn add common other
svn status
svn diff

svn ci -m "mod in alice"
# rev.16

cd ..

cd bob
svn update

# 同じファイルの別の箇所を編集
echo "insert in B.17" >> common_folder/file1.txt
# 同じファイルの同じ箇所を編集 # 同じ内容
echo "modified in A & B" >> common_folder/file2.txt
# 同じファイルの同じ箇所を編集 # 違う内容
echo "insert in B.17" >> common_folder/file3.txt

# 同じファイルを新規追加# 同じ内容
echo "create in A & B" >> common_folder/new_file1.txt
# 同じファイルを新規追加# 違う内容
echo "create in B.17" >> common_folder/new_file2.txt
svn add common_folder/new_file1.txt common_folder/new_file2.txt

# 同じフォルダを新規追加 # 中のファイルも同じ
mkdir common; echo "create folder in B.17" > common/file1.txt
echo "create folder in A & B" > common/file2.txt
# 同じフォルダを新規追加 # フォルダは同じでファイルは違う
mkdir other; echo "create folder in B.17" > other/file2.txt
svn add common other
svn status
svn diff

svn ci -m "mod in bob"
# rev.17

cd ..


# trunk -> alice
cd alice
svn update

svn merge --dry-run ^/app1/trunk
svn merge ^/app1/trunk
svn status

svn ci -m "merged from trunk in alice"
# rev.18
cd ..


# alice -> trunk (rev.16)
cd trunk
svn update

svn merge --dry-run ^/app1/branches/alice
svn diff ^/app1/trunk ^/app1/branches/alice
svn merge ^/app1/branches/alice
# --- Merging r15 through r18 into '.':
svn status

svn ci -m "merged from alice"
# rev.19

cd ..

# trunk -> alice
cd alice
svn update

svn merge --dry-run ^/app1/trunk
svn diff ^/app1/branches/alice ^/app1/trunk
svn merge ^/app1/trunk
svn status
svn resolved common_folder/new_file1.txt common_folder/new_file2.txt
svn resolved common other
svn status

svn ci -m "merged from trunk in alice"
# rev.20
cd ..

(cd alice; svn update; svn merge --dry-run ^/app1/trunk)
(cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)

# マージしたファイルをBlame した時の表示
svn blame $SP/app1/trunk/common_folder/file1.txt
svn blame -g $SP/app1/trunk/common_folder/file1.txt



# trunk -> bob (alice rev.16)
cd bob
svn update

svn merge --dry-run ^/app1/trunk
# --- Merging r13 through r20 into '.':

svn mergeinfo ^/app1/trunk
svn mergeinfo ^/app1/trunk --show-revs eligible
svn merge ^/app1/trunk
STR=`grep -v "^[<=>]" common_folder/file3.txt`; echo "$STR" > common_folder/file3.txt
svn diff common_folder/file3.txt
svn resolved common_folder/file3.txt
svn diff ^/app1/branches/bob/common_folder/new_file1.txt ^/app1/trunk/common_folder/new_file1.txt
svn resolved common_folder/new_file1.txt
svn diff ^/app1/branches/bob/common_folder/new_file2.txt ^/app1/trunk/common_folder/new_file2.txt
svn cat ^/app1/trunk/common_folder/new_file2.txt >> common_folder/new_file2.txt
svn diff common_folder/new_file2.txt
svn resolved common_folder/new_file2.txt
svn diff ^/app1/branches/bob/common ^/app1/trunk/common
svn cat ^/app1/trunk/common/file1.txt >> common/file1.txt
svn diff common
svn resolved common
svn diff ^/app1/branches/bob/other ^/app1/trunk/other
# svn cp ^/app1/trunk/other/file1.txt ./other/file1.txt
# cpだとpropに編集が加わってしまう
svn cat ^/app1/trunk/other/file1.txt > other/file1.txt
svn add other/file1.txt
svn resolved other
svn diff
svn status
svn ci -m "merge from trunk in bob"
#rev.21
cd ..


# bob -> trunk (bob rev.17)
cd trunk
svn update

svn mergeinfo ^/app1/branches/bob
svn merge --dry-run ^/app1/branches/bob
svn diff ^/app1/trunk ^/app1/branches/bob
svn merge ^/app1/branches/bob
svn diff ^/app1/trunk/common_folder/new_file1.txt ^/app1/branches/bob/common_folder/new_file1.txt
svn resolved common_folder/new_file1.txt
svn diff ^/app1/trunk/common_folder/new_file2.txt ^/app1/branches/bob/common_folder/new_file2.txt
svn cat ^/app1/branches/bob/common_folder/new_file2.txt > common_folder/new_file2.txt
svn resolved common_folder/new_file2.txt
svn diff ^/app1/trunk/common ^/app1/branches/bob/common
svn cat ^/app1/branches/bob/common/file1.txt > common/file1.txt
svn resolved common

svn diff ^/app1/trunk/other ^/app1/branches/bob/other
#svn cp ^/app1/branches/bob/other/file2.txt other/file2.txt
svn cat ^/app1/branches/bob/other/file2.txt > other/file2.txt
svn add other/file2.txt
svn resolved other
svn status
svn diff

svn ci -m "merge from bob"
# rev.22
cd ..

cd bob
svn update
svn merge --dry-run ^/app1/trunk
svn merge ^/app1/trunk
svn diff ^/app1/branches/bob/other/file2.txt ^/app1/trunk/other/file2.txt
svn resolved other/file2.txt
svn status
svn diff
svn ci -m "merge from trunk"
# rev.23

cd ..

(cd bob; svn update; svn merge --dry-run ^/app1/trunk)
(cd trunk; svn update; svn merge --dry-run ^/app1/branches/bob)



# trunk -> alice (bob rev.17)
cd alice
svn update

svn mergeinfo ^/app1/trunk
svn merge --dry-run ^/app1/trunk
svn merge ^/app1/trunk
svn status
svn diff
svn ci -m "merge from trunk"
# rev.24
cd ..

(cd alice; svn update; svn merge --dry-run ^/app1/trunk)
(cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)


# alice -> trunk
cd trunk
svn update

svn merge --dry-run ^/app1/branches/alice
svn diff ^/app1/trunk ^/app1/branches/alice
svn merge ^/app1/branches/alice
svn diff ^/app1/trunk/other/file2.txt ^/app1/branches/alice/other/file2.txt
svn resolved other/file2.txt
svn status
svn ci -m "merged from alice"
# rev.25

cd ..

(cd alice; svn update; svn merge --dry-run ^/app1/trunk)
(cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)


# trunk -> alice (bob rev.17)
cd alice
svn update

svn mergeinfo ^/app1/trunk
svn merge --dry-run ^/app1/trunk
svn merge ^/app1/trunk
svn status
svn diff
svn ci -m "merge from trunk"
# rev.26
cd ..
(cd alice; svn update; svn merge --dry-run ^/app1/trunk)
(cd trunk; svn update; svn merge --dry-run ^/app1/branches/alice)
#============================================

# 差が無いはず
svn diff $SP/app1/trunk $SP/app1/branches/alice
svn diff $SP/app1/trunk $SP/app1/branches/bob