Fossil SCM
Fix the merge pivot finder so that it honors time-warp fixes.
Commit
cf6fa2f34a1dd1cea32ba25bd3d44e866336c2261a38659a1aefba16cd5d56ba
Parent
5a88b5f6637199f…
1 file changed
+1
-1
+1
-1
| --- src/pivot.c | ||
| +++ src/pivot.c | ||
| @@ -120,11 +120,11 @@ | ||
| 120 | 120 | /* Add to the queue all ancestors of :rid. |
| 121 | 121 | */ |
| 122 | 122 | db_prepare(&i1, |
| 123 | 123 | "INSERT OR IGNORE INTO aqueue " |
| 124 | 124 | "SELECT plink.pid," |
| 125 | - " coalesce((SELECT mtime FROM plink X WHERE X.cid=plink.pid), 0.0)," | |
| 125 | + " coalesce((SELECT mtime FROM event X WHERE X.objid=plink.pid), 0.0)," | |
| 126 | 126 | " 1," |
| 127 | 127 | " aqueue.src " |
| 128 | 128 | " FROM plink, aqueue" |
| 129 | 129 | " WHERE plink.cid=:rid" |
| 130 | 130 | " AND aqueue.rid=:rid %s", |
| 131 | 131 |
| --- src/pivot.c | |
| +++ src/pivot.c | |
| @@ -120,11 +120,11 @@ | |
| 120 | /* Add to the queue all ancestors of :rid. |
| 121 | */ |
| 122 | db_prepare(&i1, |
| 123 | "INSERT OR IGNORE INTO aqueue " |
| 124 | "SELECT plink.pid," |
| 125 | " coalesce((SELECT mtime FROM plink X WHERE X.cid=plink.pid), 0.0)," |
| 126 | " 1," |
| 127 | " aqueue.src " |
| 128 | " FROM plink, aqueue" |
| 129 | " WHERE plink.cid=:rid" |
| 130 | " AND aqueue.rid=:rid %s", |
| 131 |
| --- src/pivot.c | |
| +++ src/pivot.c | |
| @@ -120,11 +120,11 @@ | |
| 120 | /* Add to the queue all ancestors of :rid. |
| 121 | */ |
| 122 | db_prepare(&i1, |
| 123 | "INSERT OR IGNORE INTO aqueue " |
| 124 | "SELECT plink.pid," |
| 125 | " coalesce((SELECT mtime FROM event X WHERE X.objid=plink.pid), 0.0)," |
| 126 | " 1," |
| 127 | " aqueue.src " |
| 128 | " FROM plink, aqueue" |
| 129 | " WHERE plink.cid=:rid" |
| 130 | " AND aqueue.rid=:rid %s", |
| 131 |