Fossil

Changes On Branch d10eee3a4b091bf3
Login

Changes On Branch d10eee3a4b091bf3

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
774
775




776
777
778
779
780
781
782
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;
        if( i>0 && fossil_strcmp(p->aTag[i-1].zName, zName)>=0 ){
          SYNTAX("T-card in the wrong order");
        if( i>0 && fossil_strcmp(p->aTag[i-1].zUuid, zUuid)>=0 ){
          if( fossil_strcmp(p->aTag[i-1].zUuid, zUuid) || fossil_strcmp(p->aTag[i-1].zName, zName)>=0 ){
            SYNTAX("T-card in the wrong order");
          }
        }
        break;
      }

      /*
      **     U ?<login>?
      **
Changes to www/fileformat.wiki.
209
210
211
212
213
214
215
216

217
218
219
220
221
222
223
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
second argument is the single characcter "<b>*</b>" instead of an
second argument is the single character "<b>*</b>" instead of an
artifact ID.  The <b>*</b> in place of the artifact ID indicates that
the tag or property applies to the current artifact.  It is not
possible to encode the current artifact ID as part of an artifact,
since the act of inserting the artifact ID would change the artifact ID,
hence a <b>*</b> is used to represent "self".  T-cards are typically
added to manifests in order to set the <b>branch</b> property and a
symbolic name when the check-in is intended to start a new branch.
283
284
285
286
287
288
289
290


291
292
293
294
295
296
297
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.
All cards must occur in strict lexicographical order.
All cards must occur in strict lexicographical order, but for
T-cards the artifact-id sorts before the tag-name.

Allowed cards in a control artifact are as follows:

<blockquote>
<b>D</b> <i>time-and-date-stamp</i><br />
<b>T</b> (<b>+</b>|<b>-</b>|<b>*</b>)<i>tag-name</i> <i>artifact-id</i> ?<i>value</i>?<br />
<b>U</b> <i>user-name</i><br />