Fossil SCM
Fix for the "-u" option on clone - make sure at least three round-trips occur as it takes that many to get the UV transfer started.
Commit
16306153c09dd89f5a8f1e29ac88ad65172f6920
Parent
a1b50dad22a2f58…
1 file changed
+1
-1
+1
-1
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -2373,11 +2373,11 @@ | ||
| 2373 | 2373 | */ |
| 2374 | 2374 | if( cloneSeqno<=0 && nCycle>1 ) go = 0; |
| 2375 | 2375 | |
| 2376 | 2376 | /* Continue looping as long as new uvfile cards are being received |
| 2377 | 2377 | ** and uvgimme cards are being sent. */ |
| 2378 | - if( nUvGimmeSent>0 && nUvFileRcvd>0 ) go = 1; | |
| 2378 | + if( nUvGimmeSent>0 && (nUvFileRcvd>0 || nCycle<3) ) go = 1; | |
| 2379 | 2379 | |
| 2380 | 2380 | db_multi_exec("DROP TABLE onremote"); |
| 2381 | 2381 | if( go ){ |
| 2382 | 2382 | manifest_crosslink_end(MC_PERMIT_HOOKS); |
| 2383 | 2383 | }else{ |
| 2384 | 2384 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -2373,11 +2373,11 @@ | |
| 2373 | */ |
| 2374 | if( cloneSeqno<=0 && nCycle>1 ) go = 0; |
| 2375 | |
| 2376 | /* Continue looping as long as new uvfile cards are being received |
| 2377 | ** and uvgimme cards are being sent. */ |
| 2378 | if( nUvGimmeSent>0 && nUvFileRcvd>0 ) go = 1; |
| 2379 | |
| 2380 | db_multi_exec("DROP TABLE onremote"); |
| 2381 | if( go ){ |
| 2382 | manifest_crosslink_end(MC_PERMIT_HOOKS); |
| 2383 | }else{ |
| 2384 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -2373,11 +2373,11 @@ | |
| 2373 | */ |
| 2374 | if( cloneSeqno<=0 && nCycle>1 ) go = 0; |
| 2375 | |
| 2376 | /* Continue looping as long as new uvfile cards are being received |
| 2377 | ** and uvgimme cards are being sent. */ |
| 2378 | if( nUvGimmeSent>0 && (nUvFileRcvd>0 || nCycle<3) ) go = 1; |
| 2379 | |
| 2380 | db_multi_exec("DROP TABLE onremote"); |
| 2381 | if( go ){ |
| 2382 | manifest_crosslink_end(MC_PERMIT_HOOKS); |
| 2383 | }else{ |
| 2384 |