History: src/pivot.c — Fossil SCM

Sync with trunk.

florian 759782533… 2024-01-22 13:40

Sync with trunk.

florian f05b04a62… 2024-01-22 13:39

Merge updates from trunk.

mistachkin e3df21cdf… 2023-05-21 03:37

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 trunk into markdown-tagrefs branch.

stephan baf038b1a… 2023-01-21 12:14

Change spelling for check-in, check-out, and related words.

danield bc36fdcf3… 2022-12-21 12:07

Change spelling for check-in and similar

danield d9c4321e7… 2022-12-20 09:46

Rename test_find_pivot() to merge_base_cmd(). No functional changes.

stephan 8cc9211f9… 2022-11-19 14:59

Upgrade the test-find-pivot command to the merge-base command, per discussion at [forum:1f5db436446…

stephan 2b6649c74… 2022-11-19 14:02

Merge updates from trunk.

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

Merge from trunk

george 8d78edddf… 2022-01-21 20:34

Merge from trunk

george 9094def2b… 2022-01-21 20:24

Merge from trunk

george 5c0515e20… 2022-01-21 20:13

Merge from trunk

george 6721c654a… 2022-01-21 19:58

Merged in trunk and resolved numerous code clashes in /chat.

stephan 54dba7479… 2021-12-16 04:20

A pikchr error output formatting fix, per [forum:e167e2e622|forum post e167e2e622], and an unrelate…

stephan c440011b7… 2021-10-18 08:13

Match the COMMAND and WEBPAGE names with _cmd and _page functions; [https://fossil-scm.org/forum/fo…

ashepilko 06afb7022… 2020-04-05 23:45

Merge trunk

jan.nijtmans fc5f88d6d… 2019-08-04 22:56

Merge trunk. Update to Beta 7 of OpenSSL 1.1.1 (pre release 9, with TLS 1.3 support !!!)

jan.nijtmans cbdbc0a0c… 2018-08-23 15:14

Merge from trunk.

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

Merge trunk

jan.nijtmans 02bc919bc… 2018-07-18 20:21

Merged trunk

mjanssen a253fba0f… 2018-06-06 10:39

Fix a bug in the pivot-finder introduced by check-in [917f1c21e52a29904] from 5 days ago.

drh 83789c6e5… 2018-06-05 23:06

Improvement to the pivot-finder so that it works even if there are time-warps in the graph.

drh 917f1c21e… 2018-05-31 15:21

Fix the merge pivot finder so that it honors time-warp fixes.

drh cf6fa2f34… 2018-05-31 14:40

merge trunk. Upgrade to openssl 1.1.0g

jan.nijtmans 9d3560b88… 2017-11-10 10:55

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

Add the --details option to the test-find-pivot command.

drh 9e48dad49… 2017-08-23 11:05

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

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

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

Add option to test-find-pivot to assist in discovering "name pivots" when diagnosing merge failures.

andybradford 3dc006c9d… 2016-11-07 08:24

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

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

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

Merged trunk and resolved conflicts. Passes all current tests.

rberteig 8c8ccac9b… 2016-05-03 08:17

Fossil SCM

src/pivot.c

Keyboard Shortcuts