Fossil SCM
Merged in [499481a72ab], thereby testing that change. No worries, autosync if off.
Commit
6cf83a010120de6c7b8e8d88bfefaa26f79d258e
Parent
f9bda0a296af98d…
1 file changed
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1727,11 +1727,11 @@ | ||
| 1727 | 1727 | int nrid; |
| 1728 | 1728 | |
| 1729 | 1729 | blob_zero(&ctrl); |
| 1730 | 1730 | zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now"); |
| 1731 | 1731 | blob_appendf(&ctrl, "D %s\n", zDate); |
| 1732 | - blob_appendf(&ctrl, "T +closed %s\n", zIntegrateUuid); | |
| 1732 | + blob_appendf(&ctrl, "T +closed %s by\\smerge\\s--integrate\n", zIntegrateUuid); | |
| 1733 | 1733 | blob_appendf(&ctrl, "U %F\n", sCiInfo.zUserOvrd ? sCiInfo.zUserOvrd : g.zLogin); |
| 1734 | 1734 | md5sum_blob(&ctrl, &cksum); |
| 1735 | 1735 | blob_appendf(&ctrl, "Z %b\n", &cksum); |
| 1736 | 1736 | nrid = content_put(&ctrl); |
| 1737 | 1737 | manifest_crosslink(nrid, &ctrl); |
| 1738 | 1738 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1727,11 +1727,11 @@ | |
| 1727 | int nrid; |
| 1728 | |
| 1729 | blob_zero(&ctrl); |
| 1730 | zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now"); |
| 1731 | blob_appendf(&ctrl, "D %s\n", zDate); |
| 1732 | blob_appendf(&ctrl, "T +closed %s\n", zIntegrateUuid); |
| 1733 | blob_appendf(&ctrl, "U %F\n", sCiInfo.zUserOvrd ? sCiInfo.zUserOvrd : g.zLogin); |
| 1734 | md5sum_blob(&ctrl, &cksum); |
| 1735 | blob_appendf(&ctrl, "Z %b\n", &cksum); |
| 1736 | nrid = content_put(&ctrl); |
| 1737 | manifest_crosslink(nrid, &ctrl); |
| 1738 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1727,11 +1727,11 @@ | |
| 1727 | int nrid; |
| 1728 | |
| 1729 | blob_zero(&ctrl); |
| 1730 | zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now"); |
| 1731 | blob_appendf(&ctrl, "D %s\n", zDate); |
| 1732 | blob_appendf(&ctrl, "T +closed %s by\\smerge\\s--integrate\n", zIntegrateUuid); |
| 1733 | blob_appendf(&ctrl, "U %F\n", sCiInfo.zUserOvrd ? sCiInfo.zUserOvrd : g.zLogin); |
| 1734 | md5sum_blob(&ctrl, &cksum); |
| 1735 | blob_appendf(&ctrl, "Z %b\n", &cksum); |
| 1736 | nrid = content_put(&ctrl); |
| 1737 | manifest_crosslink(nrid, &ctrl); |
| 1738 |