Fossil SCM
Fix the --allow-older and --force options for permitting out-of-order dating of check-ins.
Commit
086612a5a89e81e2ea880b8897570ce47cf84014
Parent
4dcea802366a8af…
1 file changed
+1
-11
+1
-11
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1443,19 +1443,15 @@ | ||
| 1443 | 1443 | if( blob_size(&comment)==0 ){ |
| 1444 | 1444 | blob_append(&comment, "(no comment)", -1); |
| 1445 | 1445 | } |
| 1446 | 1446 | sCiInfo.pComment = &comment; |
| 1447 | 1447 | sCiInfo.pCksum = useCksum ? &cksum1 : 0; |
| 1448 | + sCiInfo.verifyDate = !allowOlder && !forceFlag; | |
| 1448 | 1449 | if( forceDelta ){ |
| 1449 | 1450 | blob_zero(&manifest); |
| 1450 | 1451 | }else{ |
| 1451 | 1452 | create_manifest(&manifest, 0, 0, vid, &sCiInfo, &szB); |
| 1452 | -#if 0 | |
| 1453 | - !allowOlder && !forceFlag, useCksum ? &cksum1 : 0, | |
| 1454 | - zDateOvrd, zUserOvrd, zBranch, zColor, zBrClr, | |
| 1455 | - azTag, &szB); | |
| 1456 | -#endif | |
| 1457 | 1453 | } |
| 1458 | 1454 | |
| 1459 | 1455 | /* See if a delta-manifest would be more appropriate */ |
| 1460 | 1456 | if( !forceBaseline ){ |
| 1461 | 1457 | const char *zBaselineUuid; |
| @@ -1470,16 +1466,10 @@ | ||
| 1470 | 1466 | pBaseline = pParent; |
| 1471 | 1467 | } |
| 1472 | 1468 | if( pBaseline ){ |
| 1473 | 1469 | Blob delta; |
| 1474 | 1470 | create_manifest(&delta, zBaselineUuid, pBaseline, vid, &sCiInfo, &szD); |
| 1475 | - | |
| 1476 | -#if 0 | |
| 1477 | - !allowOlder && !forceFlag, useCksum ? &cksum1 : 0, | |
| 1478 | - zDateOvrd, zUserOvrd, zBranch, zColor, zBrClr, | |
| 1479 | - azTag, &szD); | |
| 1480 | -#endif | |
| 1481 | 1471 | /* |
| 1482 | 1472 | ** At this point, two manifests have been constructed, either of |
| 1483 | 1473 | ** which would work for this checkin. The first manifest (held |
| 1484 | 1474 | ** in the "manifest" variable) is a baseline manifest and the second |
| 1485 | 1475 | ** (held in variable named "delta") is a delta manifest. The |
| 1486 | 1476 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1443,19 +1443,15 @@ | |
| 1443 | if( blob_size(&comment)==0 ){ |
| 1444 | blob_append(&comment, "(no comment)", -1); |
| 1445 | } |
| 1446 | sCiInfo.pComment = &comment; |
| 1447 | sCiInfo.pCksum = useCksum ? &cksum1 : 0; |
| 1448 | if( forceDelta ){ |
| 1449 | blob_zero(&manifest); |
| 1450 | }else{ |
| 1451 | create_manifest(&manifest, 0, 0, vid, &sCiInfo, &szB); |
| 1452 | #if 0 |
| 1453 | !allowOlder && !forceFlag, useCksum ? &cksum1 : 0, |
| 1454 | zDateOvrd, zUserOvrd, zBranch, zColor, zBrClr, |
| 1455 | azTag, &szB); |
| 1456 | #endif |
| 1457 | } |
| 1458 | |
| 1459 | /* See if a delta-manifest would be more appropriate */ |
| 1460 | if( !forceBaseline ){ |
| 1461 | const char *zBaselineUuid; |
| @@ -1470,16 +1466,10 @@ | |
| 1470 | pBaseline = pParent; |
| 1471 | } |
| 1472 | if( pBaseline ){ |
| 1473 | Blob delta; |
| 1474 | create_manifest(&delta, zBaselineUuid, pBaseline, vid, &sCiInfo, &szD); |
| 1475 | |
| 1476 | #if 0 |
| 1477 | !allowOlder && !forceFlag, useCksum ? &cksum1 : 0, |
| 1478 | zDateOvrd, zUserOvrd, zBranch, zColor, zBrClr, |
| 1479 | azTag, &szD); |
| 1480 | #endif |
| 1481 | /* |
| 1482 | ** At this point, two manifests have been constructed, either of |
| 1483 | ** which would work for this checkin. The first manifest (held |
| 1484 | ** in the "manifest" variable) is a baseline manifest and the second |
| 1485 | ** (held in variable named "delta") is a delta manifest. The |
| 1486 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1443,19 +1443,15 @@ | |
| 1443 | if( blob_size(&comment)==0 ){ |
| 1444 | blob_append(&comment, "(no comment)", -1); |
| 1445 | } |
| 1446 | sCiInfo.pComment = &comment; |
| 1447 | sCiInfo.pCksum = useCksum ? &cksum1 : 0; |
| 1448 | sCiInfo.verifyDate = !allowOlder && !forceFlag; |
| 1449 | if( forceDelta ){ |
| 1450 | blob_zero(&manifest); |
| 1451 | }else{ |
| 1452 | create_manifest(&manifest, 0, 0, vid, &sCiInfo, &szB); |
| 1453 | } |
| 1454 | |
| 1455 | /* See if a delta-manifest would be more appropriate */ |
| 1456 | if( !forceBaseline ){ |
| 1457 | const char *zBaselineUuid; |
| @@ -1470,16 +1466,10 @@ | |
| 1466 | pBaseline = pParent; |
| 1467 | } |
| 1468 | if( pBaseline ){ |
| 1469 | Blob delta; |
| 1470 | create_manifest(&delta, zBaselineUuid, pBaseline, vid, &sCiInfo, &szD); |
| 1471 | /* |
| 1472 | ** At this point, two manifests have been constructed, either of |
| 1473 | ** which would work for this checkin. The first manifest (held |
| 1474 | ** in the "manifest" variable) is a baseline manifest and the second |
| 1475 | ** (held in variable named "delta") is a delta manifest. The |
| 1476 |