Differences From Artifact [aadadc4b34]:

• File test/merge5.test — part of check-in [413921cca0] at 2016-03-02 20:43:32 on branch testerCleanup — Rename the test suite procedure 'repo_init' to 'test_setup'. (user: mistachkin size: 10049) [more...]

To Artifact [1ec9dcc682]:

• File test/merge5.test — part of check-in [bf9669f55e] at 2016-11-07 01:29:36 on branch trunk — Remove some tabs and end-of-line whitespace (user: andygoth size: 10045) [more...]

31
32
33
34
35
36
37
38
39
40
41
42
43
44
45

  regsub -all {\n *} [string trim $RESULT] "\n    " result
  if {$result!=$expected} {
    protOut "  Expected:\n    $expected"
    protOut "  Got:\n    $result"
    test merge5-$testid 0
  } else {
    test merge5-$testid 1
  }    
}

require_no_open_checkout; test_setup ""

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

|

31
32
33
34
35
36
37
38
39
40
41
42
43
44
45

  regsub -all {\n *} [string trim $RESULT] "\n    " result
  if {$result!=$expected} {
    protOut "  Expected:\n    $expected"
    protOut "  Got:\n    $result"
    test merge5-$testid 0
  } else {
    test merge5-$testid 1
  }
}

require_no_open_checkout; test_setup ""

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