Fossil SCM
Fix merge4.test: changed merge conflict warnings.
Commit
6c230e885939f21dfeceeed07fb3d18bc8edf7aa79df2cfbc9f96837e997d57a
Parent
3e61910072dc8fe…
1 file changed
+4
-4
+4
-4
| --- test/merge4.test | ||
| +++ test/merge4.test | ||
| @@ -25,17 +25,17 @@ | ||
| 25 | 25 | write_file t2 [join [string trim $v1] \n]\n |
| 26 | 26 | write_file t3 [join [string trim $v2] \n]\n |
| 27 | 27 | fossil 3-way-merge t1 t2 t3 t4 |
| 28 | 28 | fossil 3-way-merge t1 t3 t2 t5 |
| 29 | 29 | set x [read_file t4] |
| 30 | - regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<<} $x {>} x | |
| 31 | - regsub -all {\|\|\|\|\|\|\|.*=======} $x {=} x | |
| 30 | + regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<< \(line \d+\)} $x {>} x | |
| 31 | + regsub -all {\|\|\|\|\|\|\|.*======= \(line \d+\)} $x {=} x | |
| 32 | 32 | regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $x {<} x |
| 33 | 33 | set x [split [string trim $x] \n] |
| 34 | 34 | set y [read_file t5] |
| 35 | - regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<<} $y {>} y | |
| 36 | - regsub -all {\|\|\|\|\|\|\|.*=======} $y {=} y | |
| 35 | + regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<< \(line \d+\)} $y {>} y | |
| 36 | + regsub -all {\|\|\|\|\|\|\|.*======= \(line \d+\)} $y {=} y | |
| 37 | 37 | regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $y {<} y |
| 38 | 38 | set y [split [string trim $y] \n] |
| 39 | 39 | set result1 [string trim $result1] |
| 40 | 40 | if {$x!=$result1} { |
| 41 | 41 | protOut " Expected \[$result1\]" |
| 42 | 42 |
| --- test/merge4.test | |
| +++ test/merge4.test | |
| @@ -25,17 +25,17 @@ | |
| 25 | write_file t2 [join [string trim $v1] \n]\n |
| 26 | write_file t3 [join [string trim $v2] \n]\n |
| 27 | fossil 3-way-merge t1 t2 t3 t4 |
| 28 | fossil 3-way-merge t1 t3 t2 t5 |
| 29 | set x [read_file t4] |
| 30 | regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<<} $x {>} x |
| 31 | regsub -all {\|\|\|\|\|\|\|.*=======} $x {=} x |
| 32 | regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $x {<} x |
| 33 | set x [split [string trim $x] \n] |
| 34 | set y [read_file t5] |
| 35 | regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<<} $y {>} y |
| 36 | regsub -all {\|\|\|\|\|\|\|.*=======} $y {=} y |
| 37 | regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $y {<} y |
| 38 | set y [split [string trim $y] \n] |
| 39 | set result1 [string trim $result1] |
| 40 | if {$x!=$result1} { |
| 41 | protOut " Expected \[$result1\]" |
| 42 |
| --- test/merge4.test | |
| +++ test/merge4.test | |
| @@ -25,17 +25,17 @@ | |
| 25 | write_file t2 [join [string trim $v1] \n]\n |
| 26 | write_file t3 [join [string trim $v2] \n]\n |
| 27 | fossil 3-way-merge t1 t2 t3 t4 |
| 28 | fossil 3-way-merge t1 t3 t2 t5 |
| 29 | set x [read_file t4] |
| 30 | regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<< \(line \d+\)} $x {>} x |
| 31 | regsub -all {\|\|\|\|\|\|\|.*======= \(line \d+\)} $x {=} x |
| 32 | regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $x {<} x |
| 33 | set x [split [string trim $x] \n] |
| 34 | set y [read_file t5] |
| 35 | regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<< \(line \d+\)} $y {>} y |
| 36 | regsub -all {\|\|\|\|\|\|\|.*======= \(line \d+\)} $y {=} y |
| 37 | regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $y {<} y |
| 38 | set y [split [string trim $y] \n] |
| 39 | set result1 [string trim $result1] |
| 40 | if {$x!=$result1} { |
| 41 | protOut " Expected \[$result1\]" |
| 42 |