Fossil SCM
Now don't issue warnings during cloning.
Commit
6e10a4b102fd151747c71b548279a600823e6553
Parent
4f734aa21998628…
1 file changed
+4
-2
+4
-2
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -203,11 +203,12 @@ | ||
| 203 | 203 | blob_appendf(&pXfer->err, "%s", g.zErrMsg); |
| 204 | 204 | blob_reset(&content); |
| 205 | 205 | }else{ |
| 206 | 206 | if( !isPriv ) content_make_public(rid); |
| 207 | 207 | manifest_crosslink(rid, &content, MC_NO_ERRORS); |
| 208 | - if( count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){ | |
| 208 | + if( cloneFlag==0 && | |
| 209 | + count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){ | |
| 209 | 210 | pXfer->fHasFork = 1; |
| 210 | 211 | } |
| 211 | 212 | } |
| 212 | 213 | assert( blob_is_reset(&content) ); |
| 213 | 214 | remote_has(rid); |
| @@ -282,11 +283,12 @@ | ||
| 282 | 283 | } |
| 283 | 284 | rid = content_put_ex(&content, blob_str(&pXfer->aToken[1]), srcid, |
| 284 | 285 | szC, isPriv); |
| 285 | 286 | Th_AppendToList(pzUuidList, pnUuidList, blob_str(&pXfer->aToken[1]), |
| 286 | 287 | blob_size(&pXfer->aToken[1])); |
| 287 | - if( count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){ | |
| 288 | + if( cloneFlag==0 && | |
| 289 | + count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){ | |
| 288 | 290 | pXfer->fHasFork = 1; |
| 289 | 291 | } |
| 290 | 292 | remote_has(rid); |
| 291 | 293 | blob_reset(&content); |
| 292 | 294 | } |
| 293 | 295 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -203,11 +203,12 @@ | |
| 203 | blob_appendf(&pXfer->err, "%s", g.zErrMsg); |
| 204 | blob_reset(&content); |
| 205 | }else{ |
| 206 | if( !isPriv ) content_make_public(rid); |
| 207 | manifest_crosslink(rid, &content, MC_NO_ERRORS); |
| 208 | if( count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){ |
| 209 | pXfer->fHasFork = 1; |
| 210 | } |
| 211 | } |
| 212 | assert( blob_is_reset(&content) ); |
| 213 | remote_has(rid); |
| @@ -282,11 +283,12 @@ | |
| 282 | } |
| 283 | rid = content_put_ex(&content, blob_str(&pXfer->aToken[1]), srcid, |
| 284 | szC, isPriv); |
| 285 | Th_AppendToList(pzUuidList, pnUuidList, blob_str(&pXfer->aToken[1]), |
| 286 | blob_size(&pXfer->aToken[1])); |
| 287 | if( count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){ |
| 288 | pXfer->fHasFork = 1; |
| 289 | } |
| 290 | remote_has(rid); |
| 291 | blob_reset(&content); |
| 292 | } |
| 293 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -203,11 +203,12 @@ | |
| 203 | blob_appendf(&pXfer->err, "%s", g.zErrMsg); |
| 204 | blob_reset(&content); |
| 205 | }else{ |
| 206 | if( !isPriv ) content_make_public(rid); |
| 207 | manifest_crosslink(rid, &content, MC_NO_ERRORS); |
| 208 | if( cloneFlag==0 && |
| 209 | count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){ |
| 210 | pXfer->fHasFork = 1; |
| 211 | } |
| 212 | } |
| 213 | assert( blob_is_reset(&content) ); |
| 214 | remote_has(rid); |
| @@ -282,11 +283,12 @@ | |
| 283 | } |
| 284 | rid = content_put_ex(&content, blob_str(&pXfer->aToken[1]), srcid, |
| 285 | szC, isPriv); |
| 286 | Th_AppendToList(pzUuidList, pnUuidList, blob_str(&pXfer->aToken[1]), |
| 287 | blob_size(&pXfer->aToken[1])); |
| 288 | if( cloneFlag==0 && |
| 289 | count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){ |
| 290 | pXfer->fHasFork = 1; |
| 291 | } |
| 292 | remote_has(rid); |
| 293 | blob_reset(&content); |
| 294 | } |
| 295 |