History: test/merge2.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

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

When testing, sort glob results for consistent test ordering across OSes.

preben 7fc504d10… 2023-11-17 17:44

Merge from trunk.

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

Merge trunk

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

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

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

Merge trunk

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

Merge cleanX

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

Merge trunk

andygoth 7ea74acf5… 2016-11-07 00:50

Merge trunk

jan.nijtmans 4bf71abde… 2016-11-07 00:33

Merge updates from trunk.

mistachkin 25285f06f… 2016-11-02 19:12

Merge updates from trunk.

mistachkin 82d77c23a… 2016-10-10 05:55

Merge latest updates from trunk.

andybradford 4c1971147… 2016-10-05 03:03

Merge updates from trunk.

mistachkin 04a8ee6ec… 2016-10-04 19:07

Merge from trunk.

jan 9beff66bd… 2016-09-30 21:55

Merge trunk

andygoth de845a676… 2016-09-30 20:43

In the random merge test (merge2.test) ignore cases where the parallel random edits overlap, result…

drh caea288c2… 2016-09-28 23:47

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

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

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

All test files must now call 'repo_init', using an empty string if they do not require a new reposi…

drh 3a578e049… 2016-03-02 08:13

More work...

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

Merge updates from trunk.

mistachkin 06ffd8009… 2015-04-03 02:36

Merge trunk

jan.nijtmans 1be2eb053… 2015-02-06 15:38

Workaround for recently introduced Cygwin bug: group permission is always set! This was the cause o…

jan.nijtmans d9dfe11d0… 2015-02-06 15:34

merge trunk

jan.nijtmans 9bc76f6a1… 2015-02-06 10:49

Restructure import.c, making it easier to compare with the new svn-import code. No change in functi…

jan.nijtmans 3209f0728… 2015-02-06 10:47

merge trunk

jan.nijtmans bddc40ced… 2015-02-06 10:02

Restructure import.c, making it easier to compare with the new svn-import code. No change in functi…

jan.nijtmans 62a998755… 2015-02-06 10:00

Merge updates from trunk.

mistachkin 1b35c8023… 2014-08-08 03:57

Merge from trunk

ashish c4fca467f… 2014-07-20 13:20

merge trunk

jan.nijtmans a44b4aa5a… 2014-07-10 09:25

Merge updates from trunk.

mistachkin f91d31316… 2014-06-08 00:03

merge cleanX

jan.nijtmans 8b97e37e2… 2014-02-21 15:02

merge trunk

jan.nijtmans f93b4b4db… 2014-02-21 14:46

merge trunk

jan.nijtmans 78862afd3… 2014-02-09 17:14

merge trunk

jan.nijtmans 1f1848dd0… 2014-01-29 09:22

Fossil SCM

test/merge2.test

Keyboard Shortcuts