Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch merge-integrate Through [d10eee3a4b] Excluding Merge-Ins
This is equivalent to a diff from 9aca5f7930 to d10eee3a4b
|
2013-08-17
| ||
| 12:35 | Added AUX_SCHEMA version to (version -verbose), mainly to give the libfossil configure script a way to fetch this value without poking around the db. ... (check-in: 08429eb7b2 user: stephan tags: trunk) | |
|
2013-08-16
| ||
| 14:36 | update documentation ... (Closed-Leaf check-in: d10eee3a4b user: jan.nijtmans tags: merge-integrate) | |
| 13:45 | Allow multiple T-cards with the same tags, provided they are for different uuid's which are in strict increasing order. ... (check-in: f2ae58e393 user: jan.nijtmans tags: merge-integrate) | |
| 12:44 | If the "+closed" value is an UUID, interpret this as an "fossil merge --integrate" where the uuid is the destination branch of the integration. ... (Closed-Leaf check-in: 4377917005 user: jan.nijtmans tags: merge-integrate) | |
| 10:07 | If a Control artifact contains a C-card, don't ignore it any more but display it in the timeline. Demo: [deb18ab6e3cdde20]. A "fossil rebuild" is needed to make this visible. ... (check-in: 9aca5f7930 user: jan.nijtmans tags: trunk) | |
| 09:14 | Added a minor clarification regarding fossilization of strings to the R card demo. ... (check-in: 76d901ddb9 user: stephan tags: trunk) | |
Changes to src/manifest.c.
| ︙ | |||
767 768 769 770 771 772 773 | 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 | - - + + + + |
p->nTagAlloc = p->nTagAlloc*2 + 10;
p->aTag = fossil_realloc(p->aTag, p->nTagAlloc*sizeof(p->aTag[0]) );
}
i = p->nTag++;
p->aTag[i].zName = zName;
p->aTag[i].zUuid = zUuid;
p->aTag[i].zValue = zValue;
|
| ︙ |
Changes to www/fileformat.wiki.
| ︙ | |||
209 210 211 212 213 214 215 | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | - + | character (ASCII 0x0A), and the complete text of the file. Compute the MD5 checksum of the result. A manifest might contain one or more T-cards used to set [./branching.wiki#tags | tags or properties] on the check-in. The format of the T-card is the same as described in <i>Control Artifacts</i> section below, except that the |
| ︙ | |||
283 284 285 286 287 288 289 | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 | - + + | Control artifacts are used to assign properties to other artifacts within the repository. The basic format of a control artifact is the same as a manifest or cluster. A control artifact is a text file divided into cards by newline characters. Each card has a single-character card type followed by arguments. Spaces separate the card type and the arguments. No surplus whitespace is allowed. |
| ︙ |