Fossil SCM
Output "manifest" file before content_put(). I don't think it really makes a difference, but the original code did it in this order.
Commit
8c5b5c3820e1ebc3f9c2844d079995b2d53d6b8c
Parent
9eb3f5f605a8606…
1 file changed
+5
-4
+5
-4
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1687,21 +1687,22 @@ | ||
| 1687 | 1687 | ** and rollback the transaction. |
| 1688 | 1688 | */ |
| 1689 | 1689 | if( dryRunFlag ){ |
| 1690 | 1690 | blob_write_to_file(&manifest, ""); |
| 1691 | 1691 | } |
| 1692 | - nvid = content_put(&manifest); | |
| 1693 | - if( nvid==0 ){ | |
| 1694 | - fossil_panic("trouble committing manifest: %s", g.zErrMsg); | |
| 1695 | - } | |
| 1696 | 1692 | if( outputManifest ){ |
| 1697 | 1693 | zManifestFile = mprintf("%smanifest", g.zLocalRoot); |
| 1698 | 1694 | blob_write_to_file(&manifest, zManifestFile); |
| 1699 | 1695 | blob_reset(&manifest); |
| 1700 | 1696 | blob_read_from_file(&manifest, zManifestFile); |
| 1701 | 1697 | free(zManifestFile); |
| 1702 | 1698 | } |
| 1699 | + | |
| 1700 | + nvid = content_put(&manifest); | |
| 1701 | + if( nvid==0 ){ | |
| 1702 | + fossil_panic("trouble committing manifest: %s", g.zErrMsg); | |
| 1703 | + } | |
| 1703 | 1704 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1704 | 1705 | manifest_crosslink(nvid, &manifest); |
| 1705 | 1706 | |
| 1706 | 1707 | db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid" |
| 1707 | 1708 | " WHERE id=-4"); |
| 1708 | 1709 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1687,21 +1687,22 @@ | |
| 1687 | ** and rollback the transaction. |
| 1688 | */ |
| 1689 | if( dryRunFlag ){ |
| 1690 | blob_write_to_file(&manifest, ""); |
| 1691 | } |
| 1692 | nvid = content_put(&manifest); |
| 1693 | if( nvid==0 ){ |
| 1694 | fossil_panic("trouble committing manifest: %s", g.zErrMsg); |
| 1695 | } |
| 1696 | if( outputManifest ){ |
| 1697 | zManifestFile = mprintf("%smanifest", g.zLocalRoot); |
| 1698 | blob_write_to_file(&manifest, zManifestFile); |
| 1699 | blob_reset(&manifest); |
| 1700 | blob_read_from_file(&manifest, zManifestFile); |
| 1701 | free(zManifestFile); |
| 1702 | } |
| 1703 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1704 | manifest_crosslink(nvid, &manifest); |
| 1705 | |
| 1706 | db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid" |
| 1707 | " WHERE id=-4"); |
| 1708 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1687,21 +1687,22 @@ | |
| 1687 | ** and rollback the transaction. |
| 1688 | */ |
| 1689 | if( dryRunFlag ){ |
| 1690 | blob_write_to_file(&manifest, ""); |
| 1691 | } |
| 1692 | if( outputManifest ){ |
| 1693 | zManifestFile = mprintf("%smanifest", g.zLocalRoot); |
| 1694 | blob_write_to_file(&manifest, zManifestFile); |
| 1695 | blob_reset(&manifest); |
| 1696 | blob_read_from_file(&manifest, zManifestFile); |
| 1697 | free(zManifestFile); |
| 1698 | } |
| 1699 | |
| 1700 | nvid = content_put(&manifest); |
| 1701 | if( nvid==0 ){ |
| 1702 | fossil_panic("trouble committing manifest: %s", g.zErrMsg); |
| 1703 | } |
| 1704 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1705 | manifest_crosslink(nvid, &manifest); |
| 1706 | |
| 1707 | db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid" |
| 1708 | " WHERE id=-4"); |
| 1709 |