Fossil SCM
Fix the bt= query parameter on /timeline so that it is ignored if it occurs after check-in of the p= query parameter.
Commit
15785eec6b07ed0ea3a28c770e4a2913f7d47dad81be35b8febf2fbefb5c15b7
Parent
8b7a979a74361ef…
1 file changed
+5
-2
+5
-2
| --- src/descendants.c | ||
| +++ src/descendants.c | ||
| @@ -197,12 +197,15 @@ | ||
| 197 | 197 | ** (3) Cherrypick merge parents. |
| 198 | 198 | ** (4) All ancestores of 1 and 2 but not of 3. |
| 199 | 199 | */ |
| 200 | 200 | double rLimitMtime = 0.0; |
| 201 | 201 | if( ridBackTo ){ |
| 202 | - rLimitMtime = db_double(0.0, "SELECT mtime FROM event WHERE objid=%d", | |
| 203 | - ridBackTo); | |
| 202 | + rLimitMtime = db_double(0.0, | |
| 203 | + "SELECT mtime FROM event" | |
| 204 | + " WHERE objid=%d" | |
| 205 | + " AND mtime<(SELECT mtime FROM event WHERE objid=%d)", | |
| 206 | + ridBackTo, rid); | |
| 204 | 207 | } |
| 205 | 208 | db_multi_exec( |
| 206 | 209 | "WITH RECURSIVE " |
| 207 | 210 | " parent(pid,cid,isCP) AS (" |
| 208 | 211 | " SELECT plink.pid, plink.cid, 0 AS xisCP FROM plink" |
| 209 | 212 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -197,12 +197,15 @@ | |
| 197 | ** (3) Cherrypick merge parents. |
| 198 | ** (4) All ancestores of 1 and 2 but not of 3. |
| 199 | */ |
| 200 | double rLimitMtime = 0.0; |
| 201 | if( ridBackTo ){ |
| 202 | rLimitMtime = db_double(0.0, "SELECT mtime FROM event WHERE objid=%d", |
| 203 | ridBackTo); |
| 204 | } |
| 205 | db_multi_exec( |
| 206 | "WITH RECURSIVE " |
| 207 | " parent(pid,cid,isCP) AS (" |
| 208 | " SELECT plink.pid, plink.cid, 0 AS xisCP FROM plink" |
| 209 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -197,12 +197,15 @@ | |
| 197 | ** (3) Cherrypick merge parents. |
| 198 | ** (4) All ancestores of 1 and 2 but not of 3. |
| 199 | */ |
| 200 | double rLimitMtime = 0.0; |
| 201 | if( ridBackTo ){ |
| 202 | rLimitMtime = db_double(0.0, |
| 203 | "SELECT mtime FROM event" |
| 204 | " WHERE objid=%d" |
| 205 | " AND mtime<(SELECT mtime FROM event WHERE objid=%d)", |
| 206 | ridBackTo, rid); |
| 207 | } |
| 208 | db_multi_exec( |
| 209 | "WITH RECURSIVE " |
| 210 | " parent(pid,cid,isCP) AS (" |
| 211 | " SELECT plink.pid, plink.cid, 0 AS xisCP FROM plink" |
| 212 |