History: test/merge5.test — Fossil SCM

Merge trunk into ui-local-diff branch, resolving one merge conflict in info.c:hexdump_page().

stephan d57463cc0… 2024-11-07 06:50

Sync with trunk.

florian 8e6660cd7… 2024-09-06 10:48

Sync with trunk.

florian 00f7466ad… 2024-09-06 10:47

Merge trunk into branch "loongarch"

js 116262e4a… 2024-07-21 16:22

Merge trunk into markdown-tagrefs branch.

stephan 9d3ca32ef… 2024-07-03 09:16

Fix or disable brittle test cases that were broken by changes in 2.23.

drh 5ad708085… 2024-04-24 21:25

Fix or disable brittle test cases that were broken by changes in 2.23.

drh e198bfd18… 2024-04-24 21:19

Merge trunk into markdown-tagrefs branch.

stephan 0517bd2dd… 2024-03-05 12:53

Update with all changes from trunk.

andybradford c454059a1… 2024-02-03 16:55

Sync with trunk.

florian 759782533… 2024-01-22 13:40

Sync with trunk.

florian f05b04a62… 2024-01-22 13:39

Merge current state of testing-improvements. make clean output is now easy to review.

preben e5bcfd1ef… 2024-01-12 15:48

Reduce output when testing in -quiet mode. Output is now limited to test failures (including knownB…

preben 9c23c50de… 2024-01-10 09:53

Merge updates from trunk.

mistachkin 6f3640a71… 2022-10-17 01:02

Merge from trunk.

ashepilko 19997e99c… 2018-08-02 08:32

Add support for markdown page titles

mjanssen 4a298e69e… 2017-10-04 10:59

Merge trunk

jan.nijtmans d15c1ba0f… 2017-08-31 01:59

Merge cleanX

jan.nijtmans 929761004… 2017-08-30 13:07

Merge trunk

jan.nijtmans d4f98e25c… 2017-08-30 13:02

merge trunk. Use new Win10 flag: SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE. See: [https://blogs…

jan.nijtmans 2999c7dc8… 2017-04-23 13:08

some end-of-line spacing

jan.nijtmans 7f4b50b23… 2017-04-19 06:58

Skip entire merge5.test until fossil sqlite3 --no-repository works right.

rberteig 6167f69a2… 2017-03-16 00:04

Merge trunk

jan.nijtmans 4bf7e4ef5… 2017-03-06 15:32

Merge cleanX

jan.nijtmans d73dcdd0a… 2017-02-14 19:23

merge trunk

jan.nijtmans 2ada986e1… 2017-02-06 23:31

Merge trunk. Openssl 1.1.0c -> 1.1.0d

jan.nijtmans 767ae39cf… 2017-01-27 09:02

Openssl 1.0.2j -> 1.0.2k. Whitespace.

jan.nijtmans 8cb5da6f2… 2017-01-27 08:57

Partially backout [bf9669f5]. Leave whitespace alone in test files

andygoth 6a3e2ed87… 2016-11-07 01:32

Remove some tabs and end-of-line whitespace

andygoth bf9669f55… 2016-11-07 01:29

Merge in trunk and resolve conflict.

andybradford 003b6581e… 2016-07-04 20:13

merge trunk

jan.nijtmans 414fc1e95… 2016-06-22 09:11

merge from trunk with a few tweaks for merge conflicts

scott 598b58a5e… 2016-05-31 08:17

merge cleanX

jan.nijtmans 70f77a1b6… 2016-05-21 23:58

Merge trunk

jan.nijtmans a2c0e3f22… 2016-05-21 23:48

Merge trunk.

andygoth 023601fb1… 2016-04-10 02:14

Merge trunk.

andygoth 12810dbf6… 2016-04-10 02:13

Updating from trunk.

viriketo a1b095597… 2016-04-08 13:03

Merged trunk for changes since January and test suite improvements.

rberteig 8fa24960a… 2016-03-13 23:55

Merged updates from trunk. Builds on Windows.

rberteig 9a41671bb… 2016-03-11 23:45

Cleanup, modularize, and robustify all test setup and cleanup.

mistachkin fa5922169… 2016-03-08 19:37

Merge updates from trunk.

mistachkin ff4a4fe6b… 2016-03-06 06:35

Merge updates from trunk.

mistachkin 4bd2b5459… 2016-03-06 06:35

Merge updates from trunk.

mistachkin 370c003d1… 2016-03-06 06:34

Merge updates from trunk.

mistachkin 45ed23d94… 2016-03-06 06:28

Merge updates from trunk.

mistachkin abd131b83… 2016-03-06 06:26

Rename the test suite procedure 'repo_init' to 'test_setup'.

drh 413921cca… 2016-03-02 20:43

Adjust the 'merge5' test as well.

drh b460373e0… 2016-03-02 08:25

More work...

mistachkin 29f0328cd… 2016-03-02 06:45

Work in progress on cleaning up home/repo handling in the test suite.

mistachkin 89f76a21d… 2016-03-02 06:22

Set the FOSSIL_HOME envvar before each test. Use the root test run directory instead of the directo…

joel d4907f17f… 2016-03-01 21:50

Fossil SCM

test/merge5.test

Keyboard Shortcuts