Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Improve the description of the setting so as to remove doubt about its meaning. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | fork-warn-setting |
| Files: | files | file ages | folders |
| SHA3-256: |
9660319699a153323ffb41e45448d176 |
| User & Date: | andybradford 2020-05-12 14:45:54.681 |
Context
|
2020-05-12
| ||
| 14:45 | Improve the description of the setting so as to remove doubt about its meaning. Closed-Leaf check-in: 9660319699 user: andybradford tags: fork-warn-setting | |
|
2020-05-11
| ||
| 14:09 | Add setting that will suppress the new fork warning with every commit. check-in: 57b8d6deac user: andybradford tags: fork-warn-setting | |
Changes
Changes to src/checkin.c.
| ︙ | ︙ | |||
2654 2655 2656 2657 2658 2659 2660 |
/* Clear the undo/redo stack */
undo_reset();
/* Commit */
db_multi_exec("DELETE FROM vvar WHERE name='ci-comment'");
db_multi_exec("PRAGMA repository.application_id=252006673;");
db_multi_exec("PRAGMA localdb.application_id=252006674;");
| | | 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 |
/* Clear the undo/redo stack */
undo_reset();
/* Commit */
db_multi_exec("DELETE FROM vvar WHERE name='ci-comment'");
db_multi_exec("PRAGMA repository.application_id=252006673;");
db_multi_exec("PRAGMA localdb.application_id=252006674;");
forkWarnAlways = db_get_boolean("leaf-warn-on-commit",1);
if( dryRunFlag ){
if( forkWarnAlways ){
leaf_ambiguity_warning(nvid,nvid);
}
db_end_transaction(1);
exit(1);
}
|
| ︙ | ︙ |
Changes to src/db.c.
| ︙ | ︙ | |||
3408 3409 3410 3411 3412 3413 3414 | /* ** SETTING: exec-rel-paths boolean default=off ** When executing certain external commands (e.g. diff and ** gdiff), use relative paths. */ #endif /* | | | > | 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 | /* ** SETTING: exec-rel-paths boolean default=off ** When executing certain external commands (e.g. diff and ** gdiff), use relative paths. */ #endif /* ** SETTING: leaf-warn-on-commit boolean default=on ** When committing, always warn about forks on every commit by displaying ** the multiple leaf warning. ** ** SETTING: gdiff-command width=40 default=gdiff ** The value is an external command to run when performing a graphical ** diff. If undefined, text diff will be used. */ /* ** SETTING: gmerge-command width=40 |
| ︙ | ︙ |