$ fossil co 09fc7be1f0
$ fossil clean --dotfiles --force
$ fossil status # clean
$ make
$ make test | egrep -B1 -i '(fail|expected|got)'
/home/barak/src/fossil/fossil/fossil test-3 t1 t3 t2 a32
test merge1-2.1 FAILED!
/home/barak/src/fossil/fossil/fossil test-3 t1 t2 t3 a23
test merge1-2.2 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3 t1 t3 t2 a32
test merge1-4.1 FAILED!
/home/barak/src/fossil/fossil/fossil test-3 t1 t2 t3 a23
test merge1-4.2 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3 t1 t2 t3 a23
test merge1-7.1 FAILED!
/home/barak/src/fossil/fossil/fossil test-3 t1 t2 t3 a23
test merge1-7.2 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 2 > 3b 4b 5b = 3 4 5c < 6 7 8 9]
       Got [1 2 {>: original content first <<<<<<<} 3b 4b 5b {======= original content above; conflict below =============} 3 4 5c {<: conflict last >>>>>>>>>>>>>>>>>>} 6 7 8 9]
test merge3-3 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 2 > 3b 4b 5b 6b = 3 4 5c 6 < 7 8 9]
       Got [1 2 {>: original content first <<<<<<<} 3b 4b 5b 6b {======= original content above; conflict below =============} 3 4 5c 6 {<: conflict last >>>>>>>>>>>>>>>>>>} 7 8 9]
test merge3-4 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 2 > 3b 4b 5b 6b 7 = 3 4 5c 6c 7c < 8 9]
       Got [1 2 {>: original content first <<<<<<<} 3b 4b 5b 6b 7 {======= original content above; conflict below =============} 3 4 5c 6c 7c {<: conflict last >>>>>>>>>>>>>>>>>>} 8 9]
test merge3-5 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 2 > 3b 4b 5b 6b 7 = 3 4 5c 6c 7c < 8b 9]
       Got [1 2 {>: original content first <<<<<<<} 3b 4b 5b 6b 7 {======= original content above; conflict below =============} 3 4 5c 6c 7c {<: conflict last >>>>>>>>>>>>>>>>>>} 8b 9]
test merge3-6 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 2 > 3b 4b 5b 6b 7 8b = 3 4 5c 6c 7c 8c < 9]
       Got [1 2 {>: original content first <<<<<<<} 3b 4b 5b 6b 7 8b {======= original content above; conflict below =============} 3 4 5c 6c 7c 8c {<: conflict last >>>>>>>>>>>>>>>>>>} 9]
test merge3-7 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 2 > 3b 4b 5b 6b 7 8b 9b = 3 4 5c 6c 7c 8c 9 <]
       Got [1 2 {>: original content first <<<<<<<} 3b 4b 5b 6b 7 8b 9b {======= original content above; conflict below =============} 3 4 5c 6c 7c 8c 9 {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-8 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 2 > 3b 4b = 3b 4c < 5 6c 7c 8b 9b]
       Got [1 2 {>: original content first <<<<<<<} 3b 4b {======= original content above; conflict below =============} 3b 4c {<: conflict last >>>>>>>>>>>>>>>>>>} 5 6c 7c 8b 9b]
test merge3-11 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 > 6 7 8 = 2 3 4 < 9]
       Got [1 {>: original content first <<<<<<<} 6 7 8 {======= original content above; conflict below =============} 2 3 4 {<: conflict last >>>>>>>>>>>>>>>>>>} 9]
test merge3-24 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 > 7 8 = 2 3 < 9]
       Got [1 {>: original content first <<<<<<<} 7 8 {======= original content above; conflict below =============} 2 3 {<: conflict last >>>>>>>>>>>>>>>>>>} 9]
test merge3-25 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 > 2 3 4 = 6 7 8 < 9]
       Got [1 {>: original content first <<<<<<<} 2 3 4 {======= original content above; conflict below =============} 6 7 8 {<: conflict last >>>>>>>>>>>>>>>>>>} 9]
test merge3-34 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 > 2 3 = 7 8 < 9]
       Got [1 {>: original content first <<<<<<<} 2 3 {======= original content above; conflict below =============} 7 8 {<: conflict last >>>>>>>>>>>>>>>>>>} 9]
test merge3-35 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [> 6 7 8 = 2 3 4 <]
       Got [{>: original content first <<<<<<<} 6 7 8 {======= original content above; conflict below =============} 2 3 4 {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-44 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [> 7 8 = 2 3 <]
       Got [{>: original content first <<<<<<<} 7 8 {======= original content above; conflict below =============} 2 3 {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-45 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [> 2 3 4 = 6 7 8 <]
       Got [{>: original content first <<<<<<<} 2 3 4 {======= original content above; conflict below =============} 6 7 8 {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-54 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [> 2 3 = 7 8 <]
       Got [{>: original content first <<<<<<<} 2 3 {======= original content above; conflict below =============} 7 8 {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-55 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 > 2b 3b 4b 5b 6 7 8 = 2 3 4 < 9]
       Got [1 {>: original content first <<<<<<<} 2b 3b 4b 5b 6 7 8 {======= original content above; conflict below =============} 2 3 4 {<: conflict last >>>>>>>>>>>>>>>>>>} 9]
test merge3-64 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 > 2b 3b 4b 5b 6b 7 8 = 2 3 < 9]
       Got [1 {>: original content first <<<<<<<} 2b 3b 4b 5b 6b 7 8 {======= original content above; conflict below =============} 2 3 {<: conflict last >>>>>>>>>>>>>>>>>>} 9]
test merge3-65 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 > 2 3 4 = 2b 3b 4b 5b 6 7 8 < 9]
       Got [1 {>: original content first <<<<<<<} 2 3 4 {======= original content above; conflict below =============} 2b 3b 4b 5b 6 7 8 {<: conflict last >>>>>>>>>>>>>>>>>>} 9]
test merge3-74 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 > 2 3 = 2b 3b 4b 5b 6b 7 8 < 9]
       Got [1 {>: original content first <<<<<<<} 2 3 {======= original content above; conflict below =============} 2b 3b 4b 5b 6b 7 8 {<: conflict last >>>>>>>>>>>>>>>>>>} 9]
test merge3-75 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [> 2b 3b 4b 5b 6 7 8 = 2 3 4 <]
       Got [{>: original content first <<<<<<<} 2b 3b 4b 5b 6 7 8 {======= original content above; conflict below =============} 2 3 4 {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-84 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [> 2b 3b 4b 5b 6b 7 8 = 2 3 <]
       Got [{>: original content first <<<<<<<} 2b 3b 4b 5b 6b 7 8 {======= original content above; conflict below =============} 2 3 {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-85 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [> 2 3 4 = 2b 3b 4b 5b 6 7 8 <]
       Got [{>: original content first <<<<<<<} 2 3 4 {======= original content above; conflict below =============} 2b 3b 4b 5b 6 7 8 {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-94 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [> 2 3 = 2b 3b 4b 5b 6b 7 8 <]
       Got [{>: original content first <<<<<<<} 2 3 {======= original content above; conflict below =============} 2b 3b 4b 5b 6b 7 8 {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-95 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 2 3 4 5 7 8 > 9b = 9b a b c d e <]
       Got [1 2 3 4 5 7 8 {>: original content first <<<<<<<} 9b {======= original content above; conflict below =============} 9b a b c d e {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-103 FAILED!
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t2 t3 t4
  Expected [1 2 3 4 5 7 8 > 9b a b c d e = 9b <]
       Got [1 2 3 4 5 7 8 {>: original content first <<<<<<<} 9b a b c d e {======= original content above; conflict below =============} 9b {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-104 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t3 t2 t5
  Expected [1 > 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 < 9]
       Got [1 {>: original content first <<<<<<<} 2b 3b 4b 5 6b 7b 8b {======= original content above; conflict below =============} 2 3 4c 5c 6c 7 8 {<: conflict last >>>>>>>>>>>>>>>>>>} 9]
test merge3-1000 FAILED!
--
/home/barak/src/fossil/fossil/fossil test-3-way-merge t1 t3 t2 t5
  Expected [> 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 <]
       Got [{>: original content first <<<<<<<} 2b 3b 4b 5 6b 7b 8b {======= original content above; conflict below =============} 2 3 4c 5c 6c 7 8 {<: conflict last >>>>>>>>>>>>>>>>>>}]
test merge3-1002 FAILED!
couldn't execute "sqlite3": no such file or directory
    while executing
"exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql"
    (file "/home/barak/src/fossil/fossil/test/merge5.test" line 43)
    invoked from within
"source $testdir/$testfile.test"
    ("foreach" body line 8)
    invoked from within
"foreach testfile $argv {
  set dir [file root [file tail $testfile]]
  file delete -force $dir
  file mkdir $dir
  set origwd [pwd]
  cd $dir
  protOu..."
    (file "test/tester.tcl" line 202)
make: *** [test] Error 1

anonymous added on 2010-12-21 20:14:31:
The reference output hasn't been kept in sync with the format changes. Since you are looking at this, could you provide a patch?

anonymous added on 2010-12-21 22:11:56:
I did not actually look into the issue. I was just building the latest "official" release for Debian, and the build scripts do a "make test", and that failed. So I reported it. I have not examined the problem at all.