Fossil SCM
When autosync is enabled, do both a PUSH and a PULL following each commit. Adding the PULL here makes detection of a fork work better.
Commit
bee86ff39af2bc761291f9eb5b3586e742a3279d
Parent
8a470fd4bca8a81…
1 file changed
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1527,11 +1527,11 @@ | ||
| 1527 | 1527 | exit(1); |
| 1528 | 1528 | } |
| 1529 | 1529 | db_end_transaction(0); |
| 1530 | 1530 | |
| 1531 | 1531 | if( !g.markPrivate ){ |
| 1532 | - autosync(SYNC_PUSH); | |
| 1532 | + autosync(SYNC_PUSH|SYNC_PULL); | |
| 1533 | 1533 | } |
| 1534 | 1534 | if( count_nonbranch_children(vid)>1 ){ |
| 1535 | 1535 | fossil_print("**** warning: a fork has occurred *****\n"); |
| 1536 | 1536 | } |
| 1537 | 1537 | } |
| 1538 | 1538 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1527,11 +1527,11 @@ | |
| 1527 | exit(1); |
| 1528 | } |
| 1529 | db_end_transaction(0); |
| 1530 | |
| 1531 | if( !g.markPrivate ){ |
| 1532 | autosync(SYNC_PUSH); |
| 1533 | } |
| 1534 | if( count_nonbranch_children(vid)>1 ){ |
| 1535 | fossil_print("**** warning: a fork has occurred *****\n"); |
| 1536 | } |
| 1537 | } |
| 1538 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1527,11 +1527,11 @@ | |
| 1527 | exit(1); |
| 1528 | } |
| 1529 | db_end_transaction(0); |
| 1530 | |
| 1531 | if( !g.markPrivate ){ |
| 1532 | autosync(SYNC_PUSH|SYNC_PULL); |
| 1533 | } |
| 1534 | if( count_nonbranch_children(vid)>1 ){ |
| 1535 | fossil_print("**** warning: a fork has occurred *****\n"); |
| 1536 | } |
| 1537 | } |
| 1538 |