Fossil

Differences From Artifact [9fdb69baac]:

• File test/merge5.test — part of check-in [1092a1df55] at 2010-12-22 01:32:00 on branch trunk — Fix up all of the test scripts so that the test results match the latest fossil output. Ticket [4f43f7ff92ae02ae3] (user: drh size: 9997) [more...]

To Artifact [e6293271bd]:

• File test/merge5.test — part of check-in [e46be99ff4] at 2011-10-14 19:46:34 on branch declined — Fixing the merge5 test, for it to run when out of a checkout. The same kind of fix as [0a7ab3ccb0]. (user: viriketo size: 9986)

36
37
38
39
40
41
42
43
44
45
46
47
48
49
50

  } else {
    test merge5-$testid 1
  }    
}

catch {exec $::fossilexe info} res
puts res=$res
if {![regexp {not within an open checkout} $res]} {
  puts stderr "Cannot run this test within an open checkout"
  return
}

# Construct a test repository
#
exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql

|

36
37
38
39
40
41
42
43
44
45
46
47
48
49
50

  } else {
    test merge5-$testid 1
  }    
}

catch {exec $::fossilexe info} res
puts res=$res
if {![regexp {use --repository} $res]} {
  puts stderr "Cannot run this test within an open checkout"
  return
}

# Construct a test repository
#
exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql