Fossil SCM
Forgot a line of debug code, writting manifest.new... now removed
Commit
17596784d0401188c3ba7e5f17b6073deae382b3
Parent
96f0d64a70357b5…
1 file changed
+1
-2
+1
-2
| --- src/branch.c | ||
| +++ src/branch.c | ||
| @@ -125,11 +125,11 @@ | ||
| 125 | 125 | db_end_transaction(1); |
| 126 | 126 | exit(1); |
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - blob_write_to_file(&manifest, "manifest.new"); | |
| 130 | + /*blob_write_to_file(&manifest, "manifest.new");*/ | |
| 131 | 131 | |
| 132 | 132 | nvid = content_put(&manifest, 0, 0); |
| 133 | 133 | if( nvid==0 ){ |
| 134 | 134 | fossil_panic("trouble committing manifest: %s", g.zErrMsg); |
| 135 | 135 | } |
| @@ -136,11 +136,10 @@ | ||
| 136 | 136 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 137 | 137 | manifest_crosslink(nvid, &manifest); |
| 138 | 138 | content_deltify(vid, nvid, 0); |
| 139 | 139 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); |
| 140 | 140 | printf("New_Version: %s\n", zUuid); |
| 141 | - /*db_lset_int("checkout", nvid);*/ | |
| 142 | 141 | |
| 143 | 142 | /* Verify that the manifest checksum matches the expected checksum */ |
| 144 | 143 | vfile_aggregate_checksum_repository(nvid, &cksum2); |
| 145 | 144 | vfile_aggregate_checksum_manifest(nvid, &cksum2, &cksum1b); |
| 146 | 145 | if( blob_compare(&cksum1, &cksum1b) ){ |
| 147 | 146 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -125,11 +125,11 @@ | |
| 125 | db_end_transaction(1); |
| 126 | exit(1); |
| 127 | } |
| 128 | } |
| 129 | |
| 130 | blob_write_to_file(&manifest, "manifest.new"); |
| 131 | |
| 132 | nvid = content_put(&manifest, 0, 0); |
| 133 | if( nvid==0 ){ |
| 134 | fossil_panic("trouble committing manifest: %s", g.zErrMsg); |
| 135 | } |
| @@ -136,11 +136,10 @@ | |
| 136 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 137 | manifest_crosslink(nvid, &manifest); |
| 138 | content_deltify(vid, nvid, 0); |
| 139 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); |
| 140 | printf("New_Version: %s\n", zUuid); |
| 141 | /*db_lset_int("checkout", nvid);*/ |
| 142 | |
| 143 | /* Verify that the manifest checksum matches the expected checksum */ |
| 144 | vfile_aggregate_checksum_repository(nvid, &cksum2); |
| 145 | vfile_aggregate_checksum_manifest(nvid, &cksum2, &cksum1b); |
| 146 | if( blob_compare(&cksum1, &cksum1b) ){ |
| 147 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -125,11 +125,11 @@ | |
| 125 | db_end_transaction(1); |
| 126 | exit(1); |
| 127 | } |
| 128 | } |
| 129 | |
| 130 | /*blob_write_to_file(&manifest, "manifest.new");*/ |
| 131 | |
| 132 | nvid = content_put(&manifest, 0, 0); |
| 133 | if( nvid==0 ){ |
| 134 | fossil_panic("trouble committing manifest: %s", g.zErrMsg); |
| 135 | } |
| @@ -136,11 +136,10 @@ | |
| 136 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 137 | manifest_crosslink(nvid, &manifest); |
| 138 | content_deltify(vid, nvid, 0); |
| 139 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); |
| 140 | printf("New_Version: %s\n", zUuid); |
| 141 | |
| 142 | /* Verify that the manifest checksum matches the expected checksum */ |
| 143 | vfile_aggregate_checksum_repository(nvid, &cksum2); |
| 144 | vfile_aggregate_checksum_manifest(nvid, &cksum2, &cksum1b); |
| 145 | if( blob_compare(&cksum1, &cksum1b) ){ |
| 146 |