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

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 merge_renames-13-3 on macOs as the expected a filename under /tmp but the result was under the …

preben f04443763… 2023-11-26 17:52

Fix merge_renames.test: warning about missing common ancestor changed to merge conflict warning; ch…

florian 34abaf012… 2023-11-05 12:40

Brought the ui-local-diff branch up to date relative to trunk. It isn't a simple merge, primarily …

wyoung 76fa16576… 2023-01-24 03:29

Merge updates from trunk.

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

Merge from trunk

george cea36e6c8… 2021-06-15 21:37

Merge from trunk

george 1cf5c43ea… 2021-06-15 21:27

Per /chat discussion: reopenened branch, merged in trunk, removed this branch's DROP TABLE option (…

stephan 02226325b… 2021-06-14 19:08

Merge from trunk

george 9712d59d9… 2021-06-08 01:04

Merge latest changes from trunk

mgagnon 700ae1075… 2021-04-26 15:37

Fix test 13 in merge_renames.test.

drh ad918d661… 2021-04-24 01:02

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

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

Upgrade to openssl 1.1.0c. Merge trunk (up to fossil 1.37 release)

jan.nijtmans d0fbbd011… 2017-01-18 11:19

Update test case now that merge rename bug has been fixed with checkin [0df5249d51].

andybradford b09be7ba2… 2016-12-28 18:20

Move the revert in test case to the correct sequence to avoid a merge conflict.

andybradford 3eeab4a58… 2016-11-12 22:58

Add test case to handle file add and rename before merging to trunk. Make test_setup return the rep…

andybradford 6a5f0c5b5… 2016-11-12 22:19

Merge in latest from trunk

nick.lloyd 85a0ada69… 2016-09-21 16:06

Merge with trunk; resolved tar and zip generation to handle include/exclude globs.

jan de9e7651a… 2016-08-03 01:18

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 trunk

andygoth ca59c662d… 2016-05-23 15:46

Merge trunk

andygoth 83bd4f37b… 2016-05-23 15:45

Merge trunk

andygoth 6164dac54… 2016-05-23 15:37

merge cleanX

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

Merge trunk

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

Improve the merge command's ability to handle various scenarios involving renames.

drh 41c222093… 2016-05-16 17:46

Remove unnecessary first commit (that isn't actually a commit because I didn't call "fossil add" fi…

joel 1385c8d45… 2016-05-11 22:23

Ensure that N is also a first-parent ancestor of P for cases where P is not on the same branch as e…

joel 8bf221e53… 2016-05-11 02:29

Handle merges with a specified baseline that comes after a commit with renames.

joel 8da901bb9… 2016-05-06 20:27

find_filename_changes() should report a rename even if the file ends up reverting back to its origi…

joel 0e9d50b14… 2016-05-06 20:00

Improve the merge command's ability to handle various scenarios involving renames.

joel 423029b15… 2016-05-06 19:49

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

Fossil SCM

test/merge_renames.test

Keyboard Shortcuts