Fossil SCM

← Back to file

test/merge4.test

50 commits
Sync with trunk.
florian 931e7065b… 2025-07-21 12:20
Sync with trunk.
florian 75244ee4f… 2025-07-21 12:15
Sync with trunk.
florian a2a1e4a7d… 2025-07-21 12:13
Bring the merge-info-html branch up to date with trunk, step 1 of 2.
stephan 1140b020d… 2025-02-20 14:32
Merge trunk.
danield 02cdfa5e0… 2025-01-04 23:28
Merge from trunk.
brickviking 331e51388… 2024-12-25 13:19
Merge from trunk.
brickviking 8add3c418… 2024-12-22 20:42
Update the tests to reflect the current state of development.
florian 6aee052f0… 2024-12-19 16:45
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
Add -expectError to a number of tests that are expected to generate errors or output.
preben 768d93e6e… 2024-01-10 09:36
Merge in trunk to include recent test changes.
preben 383087bfa… 2024-01-10 08:29
Test fixes for 2.24 as discussed in [forum:8d774bc3610fe8de|forum post 8d774bc3610fe8de].
preben 271a978d9… 2024-01-04 09:58
Fix merge4.test: changed merge conflict warnings.
florian 6c230e885… 2023-11-05 12:31
Merge updates from trunk.
mistachkin 6f3640a71… 2022-10-17 01:02
Merged trunk changes in. Only needed to track my own rename of branch_of_rid() to branch_of_ckin_r…
wyoung ea28708f8… 2021-03-01 07:37
Brought graham's ui-local-diff branch up to date with respect to trunk. This is not a simple merge,…
wyoung 0516f4d3c… 2021-02-14 21:28
Merge in trunk (version-2.12.1)
george 62c316306… 2020-08-26 13:31
Merge trunk, since cloning local filesystem repositories still does not work
andygoth 719dcd29c… 2020-08-16 14:45
Merge in trunk; resolve conflicts
ashepilko 7cfbf66a0… 2020-08-09 21:45
Merge enhancements from trunk into the ajax-wiki-editor branch.
drh a8cb9b1a7… 2020-07-31 12:03
Update tests to refect recent code changes
ashepilko 981049f79… 2020-07-31 02:21
Merge from trunk.
ashepilko 19997e99c… 2018-08-02 08:32
Merge trunk
jan.nijtmans d15c1ba0f… 2017-08-31 01:59
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 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 trunk
jan.nijtmans a44b4aa5a… 2014-07-10 09:25

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button