Fossil SCM
Improvements to comments and file format docs.
Commit
f0c19ea170aed65646ee4fb3ac0fb3a3f9c574bb
Parent
43fa1ecc734c9fd…
2 files changed
+3
-2
+4
-4
+3
-2
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -576,13 +576,14 @@ | ||
| 576 | 576 | break; |
| 577 | 577 | } |
| 578 | 578 | |
| 579 | 579 | /* |
| 580 | 580 | ** G <uuid> |
| 581 | + ** G <branchname> | |
| 581 | 582 | ** |
| 582 | - ** The G card records the UUID of a check-in to which a remark is | |
| 583 | - ** attached. | |
| 583 | + ** The G card records the UUID of a check-in or the name of a branch | |
| 584 | + ** to which a remark is attached. The branchname is fossil-encoded. | |
| 584 | 585 | */ |
| 585 | 586 | case 'G': { |
| 586 | 587 | if( p->zRemTarget ) SYNTAX("more than one G-card"); |
| 587 | 588 | p->zRemTarget = next_token(&x, &sz); |
| 588 | 589 | defossilize(p->zRemTarget); |
| 589 | 590 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -576,13 +576,14 @@ | |
| 576 | break; |
| 577 | } |
| 578 | |
| 579 | /* |
| 580 | ** G <uuid> |
| 581 | ** |
| 582 | ** The G card records the UUID of a check-in to which a remark is |
| 583 | ** attached. |
| 584 | */ |
| 585 | case 'G': { |
| 586 | if( p->zRemTarget ) SYNTAX("more than one G-card"); |
| 587 | p->zRemTarget = next_token(&x, &sz); |
| 588 | defossilize(p->zRemTarget); |
| 589 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -576,13 +576,14 @@ | |
| 576 | break; |
| 577 | } |
| 578 | |
| 579 | /* |
| 580 | ** G <uuid> |
| 581 | ** G <branchname> |
| 582 | ** |
| 583 | ** The G card records the UUID of a check-in or the name of a branch |
| 584 | ** to which a remark is attached. The branchname is fossil-encoded. |
| 585 | */ |
| 586 | case 'G': { |
| 587 | if( p->zRemTarget ) SYNTAX("more than one G-card"); |
| 588 | p->zRemTarget = next_token(&x, &sz); |
| 589 | defossilize(p->zRemTarget); |
| 590 |
+4
-4
| --- www/fileformat.wiki | ||
| +++ www/fileformat.wiki | ||
| @@ -536,15 +536,15 @@ | ||
| 536 | 536 | <a name="remark"></a> |
| 537 | 537 | <h2>8.0 Remarks</h2> |
| 538 | 538 | |
| 539 | 539 | A remark artifact holds textual remarks that are added to a check-in |
| 540 | 540 | or branch. |
| 541 | -Remarks can hold expanded commentary about the check-in, a description | |
| 541 | +Remarks can hold expanded commentary about a check-in, a description | |
| 542 | 542 | about the purpose of a branch, notes from |
| 543 | -code-reviews, information about problems discovered in the check-in | |
| 544 | -or branch, or other auxiliary textual information about the check-ins | |
| 545 | -and branches. | |
| 543 | +code-reviews, information about problems discovered in a check-in | |
| 544 | +or branch, or other auxiliary textual information associated with a | |
| 545 | +check-in or branch. | |
| 546 | 546 | The remark artifact is a new artifact added to this specification in |
| 547 | 547 | early 2017. |
| 548 | 548 | The following cards are allowed on a remark artifact: |
| 549 | 549 | |
| 550 | 550 | <blockquote> |
| 551 | 551 |
| --- www/fileformat.wiki | |
| +++ www/fileformat.wiki | |
| @@ -536,15 +536,15 @@ | |
| 536 | <a name="remark"></a> |
| 537 | <h2>8.0 Remarks</h2> |
| 538 | |
| 539 | A remark artifact holds textual remarks that are added to a check-in |
| 540 | or branch. |
| 541 | Remarks can hold expanded commentary about the check-in, a description |
| 542 | about the purpose of a branch, notes from |
| 543 | code-reviews, information about problems discovered in the check-in |
| 544 | or branch, or other auxiliary textual information about the check-ins |
| 545 | and branches. |
| 546 | The remark artifact is a new artifact added to this specification in |
| 547 | early 2017. |
| 548 | The following cards are allowed on a remark artifact: |
| 549 | |
| 550 | <blockquote> |
| 551 |
| --- www/fileformat.wiki | |
| +++ www/fileformat.wiki | |
| @@ -536,15 +536,15 @@ | |
| 536 | <a name="remark"></a> |
| 537 | <h2>8.0 Remarks</h2> |
| 538 | |
| 539 | A remark artifact holds textual remarks that are added to a check-in |
| 540 | or branch. |
| 541 | Remarks can hold expanded commentary about a check-in, a description |
| 542 | about the purpose of a branch, notes from |
| 543 | code-reviews, information about problems discovered in a check-in |
| 544 | or branch, or other auxiliary textual information associated with a |
| 545 | check-in or branch. |
| 546 | The remark artifact is a new artifact added to this specification in |
| 547 | early 2017. |
| 548 | The following cards are allowed on a remark artifact: |
| 549 | |
| 550 | <blockquote> |
| 551 |