Check-in [6cf83a0101]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merged in [499481a72ab], thereby testing that change. No worries, autosync if off.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:6cf83a010120de6c7b8e8d88bfefaa26f79d258e
User & Date: stephan 2013-08-15 15:54:39
Context
2013-08-15
20:22
Make formatting of the syntax for the various cards consistent, including in the summary table. check-in: 4e9522abaf user: mistachkin tags: trunk
15:54
Merged in [499481a72ab], thereby testing that change. No worries, autosync if off. check-in: 6cf83a0101 user: stephan tags: trunk
15:49
the +closed tag added by merge --integrate now added a value/comment to that effect on the closing tag. Closed-Leaf check-in: 499481a72a user: stephan tags: merge-integrate-tag
15:46
minor tweaks to the file format summary table. check-in: f9bda0a296 user: stephan tags: trunk
Changes

Changes to src/checkin.c.

1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
        Blob cksum;
        char *zDate;
        int nrid;

        blob_zero(&ctrl);
        zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now");
        blob_appendf(&ctrl, "D %s\n", zDate);
        blob_appendf(&ctrl, "T +closed %s\n", zIntegrateUuid);
        blob_appendf(&ctrl, "U %F\n", sCiInfo.zUserOvrd ? sCiInfo.zUserOvrd : g.zLogin);
        md5sum_blob(&ctrl, &cksum);
        blob_appendf(&ctrl, "Z %b\n", &cksum);
        nrid = content_put(&ctrl);
        manifest_crosslink(nrid, &ctrl);
        assert( blob_is_reset(&ctrl) );
      }







|







1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
        Blob cksum;
        char *zDate;
        int nrid;

        blob_zero(&ctrl);
        zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now");
        blob_appendf(&ctrl, "D %s\n", zDate);
        blob_appendf(&ctrl, "T +closed %s by\\smerge\\s--integrate\n", zIntegrateUuid);
        blob_appendf(&ctrl, "U %F\n", sCiInfo.zUserOvrd ? sCiInfo.zUserOvrd : g.zLogin);
        md5sum_blob(&ctrl, &cksum);
        blob_appendf(&ctrl, "Z %b\n", &cksum);
        nrid = content_put(&ctrl);
        manifest_crosslink(nrid, &ctrl);
        assert( blob_is_reset(&ctrl) );
      }