Fossil SCM
Fix merge3.test: changed merge conflict warnings.
Commit
3e61910072dc8fe979dab4613fae87142e140b75859ddd71752cca79b7a24bd4
Parent
4f9cfebf18b43af…
1 file changed
+12
-5
+12
-5
| --- test/merge3.test | ||
| +++ test/merge3.test | ||
| @@ -24,15 +24,22 @@ | ||
| 24 | 24 | write_file t1 [join [string trim $basis] \n]\n |
| 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 | set x [read_file t4] |
| 29 | - regsub -all {<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <+} $x \ | |
| 30 | - {MINE:} x | |
| 31 | - regsub -all {\|\|\|\|\|\|\| COMMON ANCESTOR content follows \|+} $x {COM:} x | |
| 32 | - regsub -all {======= MERGED IN content follows =+} $x {YOURS:} x | |
| 33 | - regsub -all {>>>>>>> END MERGE CONFLICT >+} $x {END} x | |
| 29 | + regsub -all \ | |
| 30 | + {<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <+ \(line \d+\)} \ | |
| 31 | + $x {MINE:} x | |
| 32 | + regsub -all \ | |
| 33 | + {\|\|\|\|\|\|\| COMMON ANCESTOR content follows \|+ \(line \d+\)} \ | |
| 34 | + $x {COM:} x | |
| 35 | + regsub -all \ | |
| 36 | + {======= MERGED IN content follows =+ \(line \d+\)} \ | |
| 37 | + $x {YOURS:} x | |
| 38 | + regsub -all \ | |
| 39 | + {>>>>>>> END MERGE CONFLICT >+} \ | |
| 40 | + $x {END} x | |
| 34 | 41 | set x [split [string trim $x] \n] |
| 35 | 42 | set result [string trim $result] |
| 36 | 43 | if {$x!=$result} { |
| 37 | 44 | protOut " Expected \[$result\]" |
| 38 | 45 | protOut " Got \[$x\]" |
| 39 | 46 |
| --- test/merge3.test | |
| +++ test/merge3.test | |
| @@ -24,15 +24,22 @@ | |
| 24 | write_file t1 [join [string trim $basis] \n]\n |
| 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 | set x [read_file t4] |
| 29 | regsub -all {<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <+} $x \ |
| 30 | {MINE:} x |
| 31 | regsub -all {\|\|\|\|\|\|\| COMMON ANCESTOR content follows \|+} $x {COM:} x |
| 32 | regsub -all {======= MERGED IN content follows =+} $x {YOURS:} x |
| 33 | regsub -all {>>>>>>> END MERGE CONFLICT >+} $x {END} x |
| 34 | set x [split [string trim $x] \n] |
| 35 | set result [string trim $result] |
| 36 | if {$x!=$result} { |
| 37 | protOut " Expected \[$result\]" |
| 38 | protOut " Got \[$x\]" |
| 39 |
| --- test/merge3.test | |
| +++ test/merge3.test | |
| @@ -24,15 +24,22 @@ | |
| 24 | write_file t1 [join [string trim $basis] \n]\n |
| 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 | set x [read_file t4] |
| 29 | regsub -all \ |
| 30 | {<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <+ \(line \d+\)} \ |
| 31 | $x {MINE:} x |
| 32 | regsub -all \ |
| 33 | {\|\|\|\|\|\|\| COMMON ANCESTOR content follows \|+ \(line \d+\)} \ |
| 34 | $x {COM:} x |
| 35 | regsub -all \ |
| 36 | {======= MERGED IN content follows =+ \(line \d+\)} \ |
| 37 | $x {YOURS:} x |
| 38 | regsub -all \ |
| 39 | {>>>>>>> END MERGE CONFLICT >+} \ |
| 40 | $x {END} x |
| 41 | set x [split [string trim $x] \n] |
| 42 | set result [string trim $result] |
| 43 | if {$x!=$result} { |
| 44 | protOut " Expected \[$result\]" |
| 45 | protOut " Got \[$x\]" |
| 46 |