Fossil SCM
Fix a bug in the logic for finding a pivot during a merge.
Commit
5602bbbaff8432d83e18d6b7b3d7914d61e0c1e0
Parent
3a25b683905d9eb…
1 file changed
+1
-1
+1
-1
| --- src/pivot.c | ||
| +++ src/pivot.c | ||
| @@ -69,11 +69,11 @@ | ||
| 69 | 69 | ** desired. |
| 70 | 70 | */ |
| 71 | 71 | void pivot_set_secondary(int rid){ |
| 72 | 72 | /* Insert the primary record */ |
| 73 | 73 | db_multi_exec( |
| 74 | - "INSERT INTO aqueue(rid, mtime, pending, src)" | |
| 74 | + "INSERT OR IGNORE INTO aqueue(rid, mtime, pending, src)" | |
| 75 | 75 | " SELECT %d, mtime, 1, 0 FROM plink WHERE cid=%d", |
| 76 | 76 | rid, rid |
| 77 | 77 | ); |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 |
| --- src/pivot.c | |
| +++ src/pivot.c | |
| @@ -69,11 +69,11 @@ | |
| 69 | ** desired. |
| 70 | */ |
| 71 | void pivot_set_secondary(int rid){ |
| 72 | /* Insert the primary record */ |
| 73 | db_multi_exec( |
| 74 | "INSERT INTO aqueue(rid, mtime, pending, src)" |
| 75 | " SELECT %d, mtime, 1, 0 FROM plink WHERE cid=%d", |
| 76 | rid, rid |
| 77 | ); |
| 78 | } |
| 79 | |
| 80 |
| --- src/pivot.c | |
| +++ src/pivot.c | |
| @@ -69,11 +69,11 @@ | |
| 69 | ** desired. |
| 70 | */ |
| 71 | void pivot_set_secondary(int rid){ |
| 72 | /* Insert the primary record */ |
| 73 | db_multi_exec( |
| 74 | "INSERT OR IGNORE INTO aqueue(rid, mtime, pending, src)" |
| 75 | " SELECT %d, mtime, 1, 0 FROM plink WHERE cid=%d", |
| 76 | rid, rid |
| 77 | ); |
| 78 | } |
| 79 | |
| 80 |