Fossil SCM
Improve the description of the setting so as to remove doubt about its meaning.
Commit
9660319699a153323ffb41e45448d176cf6955e0d9285f3d96222bae526964bd
Parent
57b8d6deacfac94…
2 files changed
+1
-1
+3
-2
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2656,11 +2656,11 @@ | ||
| 2656 | 2656 | |
| 2657 | 2657 | /* Commit */ |
| 2658 | 2658 | db_multi_exec("DELETE FROM vvar WHERE name='ci-comment'"); |
| 2659 | 2659 | db_multi_exec("PRAGMA repository.application_id=252006673;"); |
| 2660 | 2660 | db_multi_exec("PRAGMA localdb.application_id=252006674;"); |
| 2661 | - forkWarnAlways = db_get_boolean("fork-warn-always",1); | |
| 2661 | + forkWarnAlways = db_get_boolean("leaf-warn-on-commit",1); | |
| 2662 | 2662 | if( dryRunFlag ){ |
| 2663 | 2663 | if( forkWarnAlways ){ |
| 2664 | 2664 | leaf_ambiguity_warning(nvid,nvid); |
| 2665 | 2665 | } |
| 2666 | 2666 | db_end_transaction(1); |
| 2667 | 2667 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2656,11 +2656,11 @@ | |
| 2656 | |
| 2657 | /* Commit */ |
| 2658 | db_multi_exec("DELETE FROM vvar WHERE name='ci-comment'"); |
| 2659 | db_multi_exec("PRAGMA repository.application_id=252006673;"); |
| 2660 | db_multi_exec("PRAGMA localdb.application_id=252006674;"); |
| 2661 | forkWarnAlways = db_get_boolean("fork-warn-always",1); |
| 2662 | if( dryRunFlag ){ |
| 2663 | if( forkWarnAlways ){ |
| 2664 | leaf_ambiguity_warning(nvid,nvid); |
| 2665 | } |
| 2666 | db_end_transaction(1); |
| 2667 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2656,11 +2656,11 @@ | |
| 2656 | |
| 2657 | /* Commit */ |
| 2658 | db_multi_exec("DELETE FROM vvar WHERE name='ci-comment'"); |
| 2659 | db_multi_exec("PRAGMA repository.application_id=252006673;"); |
| 2660 | db_multi_exec("PRAGMA localdb.application_id=252006674;"); |
| 2661 | forkWarnAlways = db_get_boolean("leaf-warn-on-commit",1); |
| 2662 | if( dryRunFlag ){ |
| 2663 | if( forkWarnAlways ){ |
| 2664 | leaf_ambiguity_warning(nvid,nvid); |
| 2665 | } |
| 2666 | db_end_transaction(1); |
| 2667 |
M
src/db.c
+3
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -3410,12 +3410,13 @@ | ||
| 3410 | 3410 | ** When executing certain external commands (e.g. diff and |
| 3411 | 3411 | ** gdiff), use relative paths. |
| 3412 | 3412 | */ |
| 3413 | 3413 | #endif |
| 3414 | 3414 | /* |
| 3415 | -** SETTING: fork-warn-always boolean default=on | |
| 3416 | -** When committing, always warn about forks on every commit. | |
| 3415 | +** SETTING: leaf-warn-on-commit boolean default=on | |
| 3416 | +** When committing, always warn about forks on every commit by displaying | |
| 3417 | +** the multiple leaf warning. | |
| 3417 | 3418 | ** |
| 3418 | 3419 | ** SETTING: gdiff-command width=40 default=gdiff |
| 3419 | 3420 | ** The value is an external command to run when performing a graphical |
| 3420 | 3421 | ** diff. If undefined, text diff will be used. |
| 3421 | 3422 | */ |
| 3422 | 3423 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3410,12 +3410,13 @@ | |
| 3410 | ** When executing certain external commands (e.g. diff and |
| 3411 | ** gdiff), use relative paths. |
| 3412 | */ |
| 3413 | #endif |
| 3414 | /* |
| 3415 | ** SETTING: fork-warn-always boolean default=on |
| 3416 | ** When committing, always warn about forks on every commit. |
| 3417 | ** |
| 3418 | ** SETTING: gdiff-command width=40 default=gdiff |
| 3419 | ** The value is an external command to run when performing a graphical |
| 3420 | ** diff. If undefined, text diff will be used. |
| 3421 | */ |
| 3422 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3410,12 +3410,13 @@ | |
| 3410 | ** When executing certain external commands (e.g. diff and |
| 3411 | ** gdiff), use relative paths. |
| 3412 | */ |
| 3413 | #endif |
| 3414 | /* |
| 3415 | ** SETTING: leaf-warn-on-commit boolean default=on |
| 3416 | ** When committing, always warn about forks on every commit by displaying |
| 3417 | ** the multiple leaf warning. |
| 3418 | ** |
| 3419 | ** SETTING: gdiff-command width=40 default=gdiff |
| 3420 | ** The value is an external command to run when performing a graphical |
| 3421 | ** diff. If undefined, text diff will be used. |
| 3422 | */ |
| 3423 |