Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History for f-apps/f-merge.c
|
2024-09-28
| ||
| 00:31 | Do not clear the fsl_cx error state in the db hooks, as that hides propagating info like a merge failure report. file: [19e5c31d26] check-in: [08ed83fecc] user: stephan branch: trunk, size: 7896 | |
|
2024-07-03
| ||
| 09:13 | Remove some superfluous warnings from f-update and f-merge. file: [5318e76e02] check-in: [8861e4557f] user: stephan branch: trunk, size: 7790 | |
|
2023-04-19
| ||
| 03:23 | Remove FSL_MERGE_FCHANGE_CONFLICT_ANCESTOR and its associated handling, as fossil no longer reports that as a problem. (Edit: closing this broken branch to re-start from a clean slate after some sleep.) file: [ca2ab63762] check-in: [c575ac0028] user: stephan branch: no-common-ancestor, size: 8018 | |
|
2022-09-15
| ||
| 07:14 | f-merge: perform autosync-pull before merging. file: [fe632f2cdd] check-in: [10bedd2e61] user: stephan branch: trunk, size: 8214 | |
|
2022-06-11
| ||
| 13:05 | Expanded the label for the 'no common ancestor found' case in f-merge's legend, to indicate that it refers to new content rateher than a genuine conflict, but probably need to find a different merge state code for that case file: [d705f4de36] check-in: [bbb7322a75] user: stephan branch: trunk, size: 7663 | |
| 12:49 | f-merge now unconditionally shows the symbolic name legend if any files are modified by the merge. TODO: figure out how we can make the 'no common ancestor found' report for new merged-in files less scary. file: [c30078e2e4] check-in: [8ba74c252f] user: stephan branch: trunk, size: 7610 | |
|
2021-12-31
| ||
| 21:33 | f-merge now defaults to wet-run mode. file: [2b30f92f0a] check-in: [f3a4ba9472] user: stephan branch: trunk, size: 7788 | |
|
2021-12-21
| ||
| 08:28 | Moved fossil-scm/fossil.h to ../libfossil.h so that client code can build from both the canonical tree and amalgamation using the same include name. file: [b1b42b0ea5] check-in: [76d6359435] user: stephan branch: trunk, size: 8040 | |
|
2021-12-15
| ||
| 12:47 | Renamed and modified f-apps/f-test-merge.c → f-apps/f-merge.c. Moved fsl_ckout_merge() code from f-test-merge.c to src/merge.c. Renamed f-test-merge.c to f-merge.c. Various touchups in f-merge. file: [127a513e8c] check-in: [661999bcc7] user: stephan branch: trunk, size: 8090 | |