Fossil SCM
The MLINK.ISAUX field was being set incorrectly by all versions since the cutover to the new MLINK schema in check-in [65aa10f97c]. Run "fossil rebuild" again after upgrading to this version.
Commit
a27fa3d46beb304c04efa5a0d8cd7c6688c9f053
Parent
116921fd8665963…
1 file changed
+1
-1
+1
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1797,11 +1797,11 @@ | ||
| 1797 | 1797 | int pid = uuid_to_rid(p->azParent[i], 1); |
| 1798 | 1798 | db_multi_exec( |
| 1799 | 1799 | "INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime, baseid)" |
| 1800 | 1800 | "VALUES(%d, %d, %d, %.17g, %s)", |
| 1801 | 1801 | pid, rid, i==0, p->rDate, zBaseId/*safe-for-%s*/); |
| 1802 | - add_mlink(pid, 0, rid, p, i); | |
| 1802 | + add_mlink(pid, 0, rid, p, i==0); | |
| 1803 | 1803 | if( i==0 ) parentid = pid; |
| 1804 | 1804 | } |
| 1805 | 1805 | if( p->nParent>1 ){ |
| 1806 | 1806 | /* Remove incorrect MLINK create-file entries that arise when a |
| 1807 | 1807 | ** file is added by merge. */ |
| 1808 | 1808 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1797,11 +1797,11 @@ | |
| 1797 | int pid = uuid_to_rid(p->azParent[i], 1); |
| 1798 | db_multi_exec( |
| 1799 | "INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime, baseid)" |
| 1800 | "VALUES(%d, %d, %d, %.17g, %s)", |
| 1801 | pid, rid, i==0, p->rDate, zBaseId/*safe-for-%s*/); |
| 1802 | add_mlink(pid, 0, rid, p, i); |
| 1803 | if( i==0 ) parentid = pid; |
| 1804 | } |
| 1805 | if( p->nParent>1 ){ |
| 1806 | /* Remove incorrect MLINK create-file entries that arise when a |
| 1807 | ** file is added by merge. */ |
| 1808 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1797,11 +1797,11 @@ | |
| 1797 | int pid = uuid_to_rid(p->azParent[i], 1); |
| 1798 | db_multi_exec( |
| 1799 | "INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime, baseid)" |
| 1800 | "VALUES(%d, %d, %d, %.17g, %s)", |
| 1801 | pid, rid, i==0, p->rDate, zBaseId/*safe-for-%s*/); |
| 1802 | add_mlink(pid, 0, rid, p, i==0); |
| 1803 | if( i==0 ) parentid = pid; |
| 1804 | } |
| 1805 | if( p->nParent>1 ){ |
| 1806 | /* Remove incorrect MLINK create-file entries that arise when a |
| 1807 | ** file is added by merge. */ |
| 1808 |