Fossil SCM
Only output clone retry warning if there is another round to go.
Commit
bdd22578fa90c5bec8bdcefde9680c301b8104cac8e98f18e095d814894403c7
Parent
a92fddc02317ecd…
1 file changed
+4
-2
+4
-2
| --- src/clone.c | ||
| +++ src/clone.c | ||
| @@ -297,12 +297,14 @@ | ||
| 297 | 297 | break; |
| 298 | 298 | } |
| 299 | 299 | if( db_get_int("aux-clone-seqno",1)==1 ){ |
| 300 | 300 | fossil_fatal("server returned an error - clone aborted"); |
| 301 | 301 | } |
| 302 | - fossil_warning("cloning encountered errors, trying again."); | |
| 303 | - sqlite3_sleep(500); | |
| 302 | + if( nResumes<3 ){ | |
| 303 | + fossil_warning("cloning encountered errors, trying again."); | |
| 304 | + sqlite3_sleep(500); | |
| 305 | + } | |
| 304 | 306 | } |
| 305 | 307 | g.xlinkClusterOnly = 0; |
| 306 | 308 | verify_cancel(); |
| 307 | 309 | if( nResumeSeqno>1 ){ |
| 308 | 310 | if( nResumeSeqno==db_get_int("aux-clone-seqno",0) ){ |
| 309 | 311 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -297,12 +297,14 @@ | |
| 297 | break; |
| 298 | } |
| 299 | if( db_get_int("aux-clone-seqno",1)==1 ){ |
| 300 | fossil_fatal("server returned an error - clone aborted"); |
| 301 | } |
| 302 | fossil_warning("cloning encountered errors, trying again."); |
| 303 | sqlite3_sleep(500); |
| 304 | } |
| 305 | g.xlinkClusterOnly = 0; |
| 306 | verify_cancel(); |
| 307 | if( nResumeSeqno>1 ){ |
| 308 | if( nResumeSeqno==db_get_int("aux-clone-seqno",0) ){ |
| 309 |
| --- src/clone.c | |
| +++ src/clone.c | |
| @@ -297,12 +297,14 @@ | |
| 297 | break; |
| 298 | } |
| 299 | if( db_get_int("aux-clone-seqno",1)==1 ){ |
| 300 | fossil_fatal("server returned an error - clone aborted"); |
| 301 | } |
| 302 | if( nResumes<3 ){ |
| 303 | fossil_warning("cloning encountered errors, trying again."); |
| 304 | sqlite3_sleep(500); |
| 305 | } |
| 306 | } |
| 307 | g.xlinkClusterOnly = 0; |
| 308 | verify_cancel(); |
| 309 | if( nResumeSeqno>1 ){ |
| 310 | if( nResumeSeqno==db_get_int("aux-clone-seqno",0) ){ |
| 311 |