Artifact
4ca266f425c0bb75bd4547b1628b860aca850dec:
- File
test/merge5.test
-
2016-01-27 02:14:06
— part of check-in
[62f59956f5]
on branch rberteig-json-test
— Marked invocations of fossil that are expected to return a non-zero status with the -expectError flag in the amend, clean, and merge5 test files. This makes tester.tcl -quiet be truely quiet for those files when all tests are passing. Deliberately did not mark the invocation in merge6.test which foreshadows the failure of the merge_multi-4 test, as it is not clear to me whether the bug is in the test case or in fossil.
(user:
rberteig
size: 10202)
-
2016-02-06 02:46:40
— part of check-in
[62627615e7]
on branch trunk
— Add test cases for fossil json. Improve the test suite to support a way to treat expected non-zero status exits from fossil as success when warrented. Made minor bug fixes to the test framework, and to several test cases unrelated to JSON support.
(user:
rberteig
size: 10202)
-
2016-03-06 06:26:31
— part of check-in
[abd131b83c]
on branch mvHardDirFix
— Merge updates from trunk.
(user:
mistachkin
size: 10202)
-
2016-03-06 06:28:10
— part of check-in
[45ed23d946]
on branch altBaseUrlRepoDir
— Merge updates from trunk.
(user:
mistachkin
size: 10202)
-
2016-03-06 06:34:42
— part of check-in
[370c003d15]
on branch baruch_timeline_fixes
— Merge updates from trunk.
(user:
mistachkin
size: 10202)
-
2016-03-06 06:35:17
— part of check-in
[4bd2b54592]
on branch pending-review
— Merge updates from trunk.
(user:
mistachkin
size: 10202)
-
2016-03-06 06:35:51
— part of check-in
[ff4a4fe6b2]
on branch pending-review
— Merge updates from trunk.
(user:
mistachkin
size: 10202)