Fossil SCM
Add a new leaf ambiguity warning after each commit. (This check-in will itself be a test-case.)
Commit
707743def0a1a11f549332afff54c359d5d399a25afaf072a8e1c80d1ee03503
Parent
2d9ad2dbb92aacf…
1 file changed
+3
+3
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2648,10 +2648,11 @@ | ||
| 2648 | 2648 | /* Commit */ |
| 2649 | 2649 | db_multi_exec("DELETE FROM vvar WHERE name='ci-comment'"); |
| 2650 | 2650 | db_multi_exec("PRAGMA repository.application_id=252006673;"); |
| 2651 | 2651 | db_multi_exec("PRAGMA localdb.application_id=252006674;"); |
| 2652 | 2652 | if( dryRunFlag ){ |
| 2653 | + leaf_ambiguity_warning(nvid,nvid); | |
| 2653 | 2654 | db_end_transaction(1); |
| 2654 | 2655 | exit(1); |
| 2655 | 2656 | } |
| 2656 | 2657 | db_end_transaction(0); |
| 2657 | 2658 | |
| @@ -2670,7 +2671,9 @@ | ||
| 2670 | 2671 | int nTries = db_get_int("autosync-tries",1); |
| 2671 | 2672 | autosync_loop(syncFlags, nTries, 0); |
| 2672 | 2673 | } |
| 2673 | 2674 | if( count_nonbranch_children(vid)>1 ){ |
| 2674 | 2675 | fossil_print("**** warning: a fork has occurred *****\n"); |
| 2676 | + }else{ | |
| 2677 | + leaf_ambiguity_warning(nvid,nvid); | |
| 2675 | 2678 | } |
| 2676 | 2679 | } |
| 2677 | 2680 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2648,10 +2648,11 @@ | |
| 2648 | /* Commit */ |
| 2649 | db_multi_exec("DELETE FROM vvar WHERE name='ci-comment'"); |
| 2650 | db_multi_exec("PRAGMA repository.application_id=252006673;"); |
| 2651 | db_multi_exec("PRAGMA localdb.application_id=252006674;"); |
| 2652 | if( dryRunFlag ){ |
| 2653 | db_end_transaction(1); |
| 2654 | exit(1); |
| 2655 | } |
| 2656 | db_end_transaction(0); |
| 2657 | |
| @@ -2670,7 +2671,9 @@ | |
| 2670 | int nTries = db_get_int("autosync-tries",1); |
| 2671 | autosync_loop(syncFlags, nTries, 0); |
| 2672 | } |
| 2673 | if( count_nonbranch_children(vid)>1 ){ |
| 2674 | fossil_print("**** warning: a fork has occurred *****\n"); |
| 2675 | } |
| 2676 | } |
| 2677 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2648,10 +2648,11 @@ | |
| 2648 | /* Commit */ |
| 2649 | db_multi_exec("DELETE FROM vvar WHERE name='ci-comment'"); |
| 2650 | db_multi_exec("PRAGMA repository.application_id=252006673;"); |
| 2651 | db_multi_exec("PRAGMA localdb.application_id=252006674;"); |
| 2652 | if( dryRunFlag ){ |
| 2653 | leaf_ambiguity_warning(nvid,nvid); |
| 2654 | db_end_transaction(1); |
| 2655 | exit(1); |
| 2656 | } |
| 2657 | db_end_transaction(0); |
| 2658 | |
| @@ -2670,7 +2671,9 @@ | |
| 2671 | int nTries = db_get_int("autosync-tries",1); |
| 2672 | autosync_loop(syncFlags, nTries, 0); |
| 2673 | } |
| 2674 | if( count_nonbranch_children(vid)>1 ){ |
| 2675 | fossil_print("**** warning: a fork has occurred *****\n"); |
| 2676 | }else{ |
| 2677 | leaf_ambiguity_warning(nvid,nvid); |
| 2678 | } |
| 2679 | } |
| 2680 |