Fossil SCM
In the random merge test (merge2.test) ignore cases where the parallel random edits overlap, resulting in a merge conflict.
Commit
caea288c2df6f803019891ab6d67ed8be15b27a5
Parent
233e9328ee639b3…
1 file changed
+1
+1
| --- test/merge2.test | ||
| +++ test/merge2.test | ||
| @@ -35,10 +35,11 @@ | ||
| 35 | 35 | expr {srand($i*2+1)} |
| 36 | 36 | write_file t23 [random_changes $f2 2 4 2 0.1] |
| 37 | 37 | expr {srand($i*2)} |
| 38 | 38 | write_file t32 [random_changes $f3 2 4 0 0.1] |
| 39 | 39 | fossil 3-way-merge t1 t2 t3 a23 |
| 40 | + if {[regexp {<<<<< BEGIN MERGE CONFLICT:} [read_file a23]]} continue | |
| 40 | 41 | test merge-$base-$i-23 {[same_file a23 t23]} |
| 41 | 42 | fossil 3-way-merge t1 t3 t2 a32 |
| 42 | 43 | test merge-$base-$i-32 {[same_file a32 t32]} |
| 43 | 44 | } |
| 44 | 45 | } |
| 45 | 46 |
| --- test/merge2.test | |
| +++ test/merge2.test | |
| @@ -35,10 +35,11 @@ | |
| 35 | expr {srand($i*2+1)} |
| 36 | write_file t23 [random_changes $f2 2 4 2 0.1] |
| 37 | expr {srand($i*2)} |
| 38 | write_file t32 [random_changes $f3 2 4 0 0.1] |
| 39 | fossil 3-way-merge t1 t2 t3 a23 |
| 40 | test merge-$base-$i-23 {[same_file a23 t23]} |
| 41 | fossil 3-way-merge t1 t3 t2 a32 |
| 42 | test merge-$base-$i-32 {[same_file a32 t32]} |
| 43 | } |
| 44 | } |
| 45 |
| --- test/merge2.test | |
| +++ test/merge2.test | |
| @@ -35,10 +35,11 @@ | |
| 35 | expr {srand($i*2+1)} |
| 36 | write_file t23 [random_changes $f2 2 4 2 0.1] |
| 37 | expr {srand($i*2)} |
| 38 | write_file t32 [random_changes $f3 2 4 0 0.1] |
| 39 | fossil 3-way-merge t1 t2 t3 a23 |
| 40 | if {[regexp {<<<<< BEGIN MERGE CONFLICT:} [read_file a23]]} continue |
| 41 | test merge-$base-$i-23 {[same_file a23 t23]} |
| 42 | fossil 3-way-merge t1 t3 t2 a32 |
| 43 | test merge-$base-$i-32 {[same_file a32 t32]} |
| 44 | } |
| 45 | } |
| 46 |