Fossil SCM
Do not print a warning about "a fork has occurred" when checking in to a leaf that is also the basis of a branch.
Commit
8d5ab7913e4d06e074a6769079b6d16a343eef07
Parent
ba6687f2423d538…
1 file changed
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -644,11 +644,11 @@ | ||
| 644 | 644 | |
| 645 | 645 | /* Commit */ |
| 646 | 646 | db_end_transaction(0); |
| 647 | 647 | |
| 648 | 648 | autosync(AUTOSYNC_PUSH); |
| 649 | - if( db_exists("SELECT 1 FROM plink WHERE pid=%d AND cid!=%d", vid, nvid) ){ | |
| 649 | + if( count_nonbranch_children(vid)>1 ){ | |
| 650 | 650 | printf("**** warning: a fork has occurred *****\n"); |
| 651 | 651 | } |
| 652 | 652 | } |
| 653 | 653 | |
| 654 | 654 | /* |
| 655 | 655 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -644,11 +644,11 @@ | |
| 644 | |
| 645 | /* Commit */ |
| 646 | db_end_transaction(0); |
| 647 | |
| 648 | autosync(AUTOSYNC_PUSH); |
| 649 | if( db_exists("SELECT 1 FROM plink WHERE pid=%d AND cid!=%d", vid, nvid) ){ |
| 650 | printf("**** warning: a fork has occurred *****\n"); |
| 651 | } |
| 652 | } |
| 653 | |
| 654 | /* |
| 655 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -644,11 +644,11 @@ | |
| 644 | |
| 645 | /* Commit */ |
| 646 | db_end_transaction(0); |
| 647 | |
| 648 | autosync(AUTOSYNC_PUSH); |
| 649 | if( count_nonbranch_children(vid)>1 ){ |
| 650 | printf("**** warning: a fork has occurred *****\n"); |
| 651 | } |
| 652 | } |
| 653 | |
| 654 | /* |
| 655 |