Fossil SCM
Give a better error message if structural artifact cards are out-of-order.
Commit
72f5101ef0ba008897643dc6e90acb645c995e3d4572e7825ba77f7fbb68f0b2
Parent
36620b74a46b207…
1 file changed
+3
-1
+3
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -543,11 +543,13 @@ | ||
| 543 | 543 | ** was a bug in technote generation (prior to 2021-02-10) that caused |
| 544 | 544 | ** the P card to occur before the N card. Hence, for historical |
| 545 | 545 | ** compatibility, we do allow the N card of a technote to occur after |
| 546 | 546 | ** the P card. See tickets 15d04de574383d61 and 5e67a7f4041a36ad. |
| 547 | 547 | */ |
| 548 | - if( cType!='N' || cPrevType!='P' || p->zEventId==0 ) break; | |
| 548 | + if( cType!='N' || cPrevType!='P' || p->zEventId==0 ){ | |
| 549 | + SYNTAX("cards not in lexicographical order"); | |
| 550 | + } | |
| 549 | 551 | } |
| 550 | 552 | lineNo++; |
| 551 | 553 | if( cType<'A' || cType>'Z' ) SYNTAX("bad card type"); |
| 552 | 554 | seenCard |= 1 << (cType-'A'); |
| 553 | 555 | cPrevType = cType; |
| 554 | 556 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -543,11 +543,13 @@ | |
| 543 | ** was a bug in technote generation (prior to 2021-02-10) that caused |
| 544 | ** the P card to occur before the N card. Hence, for historical |
| 545 | ** compatibility, we do allow the N card of a technote to occur after |
| 546 | ** the P card. See tickets 15d04de574383d61 and 5e67a7f4041a36ad. |
| 547 | */ |
| 548 | if( cType!='N' || cPrevType!='P' || p->zEventId==0 ) break; |
| 549 | } |
| 550 | lineNo++; |
| 551 | if( cType<'A' || cType>'Z' ) SYNTAX("bad card type"); |
| 552 | seenCard |= 1 << (cType-'A'); |
| 553 | cPrevType = cType; |
| 554 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -543,11 +543,13 @@ | |
| 543 | ** was a bug in technote generation (prior to 2021-02-10) that caused |
| 544 | ** the P card to occur before the N card. Hence, for historical |
| 545 | ** compatibility, we do allow the N card of a technote to occur after |
| 546 | ** the P card. See tickets 15d04de574383d61 and 5e67a7f4041a36ad. |
| 547 | */ |
| 548 | if( cType!='N' || cPrevType!='P' || p->zEventId==0 ){ |
| 549 | SYNTAX("cards not in lexicographical order"); |
| 550 | } |
| 551 | } |
| 552 | lineNo++; |
| 553 | if( cType<'A' || cType>'Z' ) SYNTAX("bad card type"); |
| 554 | seenCard |= 1 << (cType-'A'); |
| 555 | cPrevType = cType; |
| 556 |