Attachment "fix-aa01499923.patch" to
ticket [aa014999]
added by
chi
2010-10-30 06:08:38.
CHANGED test/merge1.test
Index: test/merge1.test
===================================================================
--- test/merge1.test
+++ test/merge1.test
@@ -77,26 +77,26 @@
333 - This is a test of the merging algohm - 3333
444 - If all goes well, we will be pleased - 4444
555 - we think it well and other stuff too - 5555
}
write_file_indented t23 {
- >>>>>>> BEGIN MERGE CONFLICT
+ <<<<<<< BEGIN MERGE CONFLICT
111 - This is line ONE of the demo program - 1111
============================
111 - This is line one OF the demo program - 1111
- <<<<<<< END MERGE CONFLICT
+ >>>>>>> END MERGE CONFLICT
222 - The second line program line in code - 2222
333 - This is a test of the merging algohm - 3333
444 - If all goes well, we will be pleased - 4444
555 - we think it well and other stuff too - 5555
}
write_file_indented t32 {
- >>>>>>> BEGIN MERGE CONFLICT
+ <<<<<<< BEGIN MERGE CONFLICT
111 - This is line one OF the demo program - 1111
============================
111 - This is line ONE of the demo program - 1111
- <<<<<<< END MERGE CONFLICT
+ >>>>>>> END MERGE CONFLICT
222 - The second line program line in code - 2222
333 - This is a test of the merging algohm - 3333
444 - If all goes well, we will be pleased - 4444
555 - we think it well and other stuff too - 5555
}
@@ -158,26 +158,26 @@
333 - This is a test of the merging algohm - 3333
444 - If all goes well, we will be pleased - 4444
555 - we think it well and other stuff too - 5555
}
write_file_indented t32 {
- >>>>>>> BEGIN MERGE CONFLICT
+ <<<<<<< BEGIN MERGE CONFLICT
============================
000 - Zero lines added to the beginning of - 0000
111 - This is line one of the demo program - 1111
- <<<<<<< END MERGE CONFLICT
+ >>>>>>> END MERGE CONFLICT
222 - The second line program line in code - 2222
333 - This is a test of the merging algohm - 3333
444 - If all goes well, we will be pleased - 4444
555 - we think it well and other stuff too - 5555
}
write_file_indented t23 {
- >>>>>>> BEGIN MERGE CONFLICT
+ <<<<<<< BEGIN MERGE CONFLICT
000 - Zero lines added to the beginning of - 0000
111 - This is line one of the demo program - 1111
============================
- <<<<<<< END MERGE CONFLICT
+ >>>>>>> END MERGE CONFLICT
222 - The second line program line in code - 2222
333 - This is a test of the merging algohm - 3333
444 - If all goes well, we will be pleased - 4444
555 - we think it well and other stuff too - 5555
}
@@ -293,11 +293,11 @@
STUV
XYZ.
}
write_file_indented t23 {
abcd
- >>>>>>> BEGIN MERGE CONFLICT
+ <<<<<<< BEGIN MERGE CONFLICT
efgh 2
ijkl 2
mnop 2
qrst
uvwx
@@ -311,11 +311,11 @@
qrst 3
uvwx 3
yzAB 3
CDEF
GHIJ
- <<<<<<< END MERGE CONFLICT
+ >>>>>>> END MERGE CONFLICT
KLMN
OPQR
STUV
XYZ.
}
@@ -354,11 +354,11 @@
}
write_file_indented t23 {
abcd
efgh 2
ijkl 2
- >>>>>>> BEGIN MERGE CONFLICT
+ <<<<<<< BEGIN MERGE CONFLICT
mnop
qrst
uvwx
yzAB 2
CDEF 2
@@ -368,13 +368,13 @@
qrst 3
uvwx 3
yzAB 3
CDEF
GHIJ
- <<<<<<< END MERGE CONFLICT
+ >>>>>>> END MERGE CONFLICT
KLMN
OPQR
STUV
XYZ.
}
fossil test-3 t1 t2 t3 a23
test merge1-7.2 {[same_file t23 a23]}
CHANGED test/merge3.test
Index: test/merge3.test
===================================================================
--- test/merge3.test
+++ test/merge3.test
@@ -28,13 +28,13 @@
write_file t1 [join [string trim $basis] \n]\n
write_file t2 [join [string trim $v1] \n]\n
write_file t3 [join [string trim $v2] \n]\n
fossil test-3-way-merge t1 t2 t3 t4
set x [read_file t4]
- regsub -all {>>>>>>> BEGIN MERGE CONFLICT} $x {>} x
+ regsub -all {<<<<<<< BEGIN MERGE CONFLICT} $x {<} x
regsub -all {============================} $x {=} x
- regsub -all {<<<<<<< END MERGE CONFLICT} $x {<} x
+ regsub -all {>>>>>>> END MERGE CONFLICT} $x {>} x
set x [split [string trim $x] \n]
set result [string trim $result]
if {$x!=$result} {
puts " Expected \[$result\]"
puts " Got \[$x\]"
@@ -68,56 +68,56 @@
} {
1 2 3b 4b 5b 6 7 8 9
} {
1 2 3 4 5c 6 7 8 9
} {
- 1 2 > 3b 4b 5b = 3 4 5c < 6 7 8 9
+ 1 2 < 3b 4b 5b = 3 4 5c > 6 7 8 9
}
merge-test 4 {
1 2 3 4 5 6 7 8 9
} {
1 2 3b 4b 5b 6b 7 8 9
} {
1 2 3 4 5c 6 7 8 9
} {
- 1 2 > 3b 4b 5b 6b = 3 4 5c 6 < 7 8 9
+ 1 2 < 3b 4b 5b 6b = 3 4 5c 6 > 7 8 9
}
merge-test 5 {
1 2 3 4 5 6 7 8 9
} {
1 2 3b 4b 5b 6b 7 8 9
} {
1 2 3 4 5c 6c 7c 8 9
} {
- 1 2 > 3b 4b 5b 6b 7 = 3 4 5c 6c 7c < 8 9
+ 1 2 < 3b 4b 5b 6b 7 = 3 4 5c 6c 7c > 8 9
}
merge-test 6 {
1 2 3 4 5 6 7 8 9
} {
1 2 3b 4b 5b 6b 7 8b 9
} {
1 2 3 4 5c 6c 7c 8 9
} {
- 1 2 > 3b 4b 5b 6b 7 = 3 4 5c 6c 7c < 8b 9
+ 1 2 < 3b 4b 5b 6b 7 = 3 4 5c 6c 7c > 8b 9
}
merge-test 7 {
1 2 3 4 5 6 7 8 9
} {
1 2 3b 4b 5b 6b 7 8b 9
} {
1 2 3 4 5c 6c 7c 8c 9
} {
- 1 2 > 3b 4b 5b 6b 7 8b = 3 4 5c 6c 7c 8c < 9
+ 1 2 < 3b 4b 5b 6b 7 8b = 3 4 5c 6c 7c 8c > 9
}
merge-test 8 {
1 2 3 4 5 6 7 8 9
} {
1 2 3b 4b 5b 6b 7 8b 9b
} {
1 2 3 4 5c 6c 7c 8c 9
} {
- 1 2 > 3b 4b 5b 6b 7 8b 9b = 3 4 5c 6c 7c 8c 9 <
+ 1 2 < 3b 4b 5b 6b 7 8b 9b = 3 4 5c 6c 7c 8c 9 >
}
merge-test 9 {
1 2 3 4 5 6 7 8 9
} {
1 2 3b 4b 5 6 7 8b 9b
@@ -141,11 +141,11 @@
} {
1 2 3b 4b 5 6 7 8b 9b
} {
1 2 3b 4c 5 6c 7c 8 9
} {
- 1 2 > 3b 4b = 3b 4c < 5 6c 7c 8b 9b
+ 1 2 < 3b 4b = 3b 4c > 5 6c 7c 8b 9b
}
merge-test 12 {
1 2 3 4 5 6 7 8 9
} {
1 2 3b4b 5 6 7 8b 9b
@@ -196,20 +196,20 @@
} {
1 6 7 8 9
} {
1 2 3 4 9
} {
- 1 > 6 7 8 = 2 3 4 < 9
+ 1 < 6 7 8 = 2 3 4 > 9
}
merge-test 25 {
1 2 3 4 5 6 7 8 9
} {
1 7 8 9
} {
1 2 3 9
} {
- 1 > 7 8 = 2 3 < 9
+ 1 < 7 8 = 2 3 > 9
}
merge-test 30 {
1 2 3 4 5 6 7 8 9
} {
@@ -251,20 +251,20 @@
} {
1 2 3 4 9
} {
1 6 7 8 9
} {
- 1 > 2 3 4 = 6 7 8 < 9
+ 1 < 2 3 4 = 6 7 8 > 9
}
merge-test 35 {
1 2 3 4 5 6 7 8 9
} {
1 2 3 9
} {
1 7 8 9
} {
- 1 > 2 3 = 7 8 < 9
+ 1 < 2 3 = 7 8 > 9
}
merge-test 40 {
2 3 4 5 6 7 8
} {
@@ -306,20 +306,20 @@
} {
6 7 8
} {
2 3 4
} {
- > 6 7 8 = 2 3 4 <
+ < 6 7 8 = 2 3 4 >
}
merge-test 45 {
2 3 4 5 6 7 8
} {
7 8
} {
2 3
} {
- > 7 8 = 2 3 <
+ < 7 8 = 2 3 >
}
merge-test 50 {
2 3 4 5 6 7 8
} {
@@ -360,20 +360,20 @@
} {
2 3 4
} {
6 7 8
} {
- > 2 3 4 = 6 7 8 <
+ < 2 3 4 = 6 7 8 >
}
merge-test 55 {
2 3 4 5 6 7 8
} {
2 3
} {
7 8
} {
- > 2 3 = 7 8 <
+ < 2 3 = 7 8 >
}
merge-test 60 {
1 2 3 4 5 6 7 8 9
} {
@@ -415,20 +415,20 @@
} {
1 2b 3b 4b 5b 6 7 8 9
} {
1 2 3 4 9
} {
- 1 > 2b 3b 4b 5b 6 7 8 = 2 3 4 < 9
+ 1 < 2b 3b 4b 5b 6 7 8 = 2 3 4 > 9
}
merge-test 65 {
1 2 3 4 5 6 7 8 9
} {
1 2b 3b 4b 5b 6b 7 8 9
} {
1 2 3 9
} {
- 1 > 2b 3b 4b 5b 6b 7 8 = 2 3 < 9
+ 1 < 2b 3b 4b 5b 6b 7 8 = 2 3 > 9
}
merge-test 70 {
1 2 3 4 5 6 7 8 9
} {
@@ -470,20 +470,20 @@
} {
1 2 3 4 9
} {
1 2b 3b 4b 5b 6 7 8 9
} {
- 1 > 2 3 4 = 2b 3b 4b 5b 6 7 8 < 9
+ 1 < 2 3 4 = 2b 3b 4b 5b 6 7 8 > 9
}
merge-test 75 {
1 2 3 4 5 6 7 8 9
} {
1 2 3 9
} {
1 2b 3b 4b 5b 6b 7 8 9
} {
- 1 > 2 3 = 2b 3b 4b 5b 6b 7 8 < 9
+ 1 < 2 3 = 2b 3b 4b 5b 6b 7 8 > 9
}
merge-test 80 {
2 3 4 5 6 7 8
} {
@@ -525,20 +525,20 @@
} {
2b 3b 4b 5b 6 7 8
} {
2 3 4
} {
- > 2b 3b 4b 5b 6 7 8 = 2 3 4 <
+ < 2b 3b 4b 5b 6 7 8 = 2 3 4 >
}
merge-test 85 {
2 3 4 5 6 7 8
} {
2b 3b 4b 5b 6b 7 8
} {
2 3
} {
- > 2b 3b 4b 5b 6b 7 8 = 2 3 <
+ < 2b 3b 4b 5b 6b 7 8 = 2 3 >
}
merge-test 90 {
2 3 4 5 6 7 8
} {
@@ -580,20 +580,20 @@
} {
2 3 4
} {
2b 3b 4b 5b 6 7 8
} {
- > 2 3 4 = 2b 3b 4b 5b 6 7 8 <
+ < 2 3 4 = 2b 3b 4b 5b 6 7 8 >
}
merge-test 95 {
2 3 4 5 6 7 8
} {
2 3
} {
2b 3b 4b 5b 6b 7 8
} {
- > 2 3 = 2b 3b 4b 5b 6b 7 8 <
+ < 2 3 = 2b 3b 4b 5b 6b 7 8 >
}
merge-test 100 {
1 2 3 4 5 6 7 8 9
} {
@@ -626,16 +626,16 @@
} {
1 2 3 4 5 7 8 9b
} {
1 2 3 4 5 7 8 9b a b c d e
} {
- 1 2 3 4 5 7 8 > 9b = 9b a b c d e <
+ 1 2 3 4 5 7 8 < 9b = 9b a b c d e >
}
merge-test 104 {
1 2 3 4 5 6 7 8 9
} {
1 2 3 4 5 7 8 9b a b c d e
} {
1 2 3 4 5 7 8 9b
} {
- 1 2 3 4 5 7 8 > 9b a b c d e = 9b <
+ 1 2 3 4 5 7 8 < 9b a b c d e = 9b >
}
CHANGED test/merge4.test
Index: test/merge4.test
===================================================================
--- test/merge4.test
+++ test/merge4.test
@@ -29,18 +29,18 @@
write_file t2 [join [string trim $v1] \n]\n
write_file t3 [join [string trim $v2] \n]\n
fossil test-3-way-merge t1 t2 t3 t4
fossil test-3-way-merge t1 t3 t2 t5
set x [read_file t4]
- regsub -all {>>>>>>> BEGIN MERGE CONFLICT} $x {>} x
+ regsub -all {<<<<<<< BEGIN MERGE CONFLICT} $x {<} x
regsub -all {============================} $x {=} x
- regsub -all {<<<<<<< END MERGE CONFLICT} $x {<} x
+ regsub -all {>>>>>>> END MERGE CONFLICT} $x {>} x
set x [split [string trim $x] \n]
set y [read_file t5]
- regsub -all {>>>>>>> BEGIN MERGE CONFLICT} $y {>} y
+ regsub -all {<<<<<<< BEGIN MERGE CONFLICT} $y {<} y
regsub -all {============================} $y {=} y
- regsub -all {<<<<<<< END MERGE CONFLICT} $y {<} y
+ regsub -all {>>>>>>> END MERGE CONFLICT} $y {>} y
set y [split [string trim $y] \n]
set result1 [string trim $result1]
if {$x!=$result1} {
puts " Expected \[$result1\]"
puts " Got \[$x\]"
@@ -62,13 +62,13 @@
} {
1 2b 3b 4b 5 6b 7b 8b 9
} {
1 2 3 4c 5c 6c 7 8 9
} {
- 1 > 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 < 9
+ 1 < 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 > 9
} {
- 1 > 2 3 4c 5c 6c 7 8 = 2b 3b 4b 5 6b 7b 8b < 9
+ 1 < 2 3 4c 5c 6c 7 8 = 2b 3b 4b 5 6b 7b 8b > 9
}
merge-test 1001 {
1 2 3 4 5 6 7 8 9
} {
1 2b 3b 4 5 6 7b 8b 9
@@ -84,13 +84,13 @@
} {
2b 3b 4b 5 6b 7b 8b
} {
2 3 4c 5c 6c 7 8
} {
- > 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 <
+ < 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 >
} {
- > 2 3 4c 5c 6c 7 8 = 2b 3b 4b 5 6b 7b 8b <
+ < 2 3 4c 5c 6c 7 8 = 2b 3b 4b 5 6b 7b 8b >
}
merge-test 1003 {
2 3 4 5 6 7 8
} {
2b 3b 4 5 6 7b 8b