Fossil SCM
Fix "json timeline" to don't show duplicate files in some chek-ins with merge. Same way CLI timeline was fix on [3c34db8d].
Commit
26d903de0c1f17f8d7e528621dd429ffe6535c77
Parent
c1c8d728f937bda…
1 file changed
+1
-1
+1
-1
| --- src/json_timeline.c | ||
| +++ src/json_timeline.c | ||
| @@ -326,11 +326,11 @@ | ||
| 326 | 326 | " blob.uuid as uuid," |
| 327 | 327 | " (SELECT uuid FROM blob WHERE rid=pid) as parent," |
| 328 | 328 | " blob.size as size" |
| 329 | 329 | " FROM mlink, blob" |
| 330 | 330 | " WHERE mid=%d AND pid!=fid" |
| 331 | - " AND blob.rid=fid " | |
| 331 | + " AND blob.rid=fid AND NOT mlink.isaux" | |
| 332 | 332 | " ORDER BY name /*sort*/", |
| 333 | 333 | rid |
| 334 | 334 | ); |
| 335 | 335 | while( (SQLITE_ROW == db_step(&q)) ){ |
| 336 | 336 | cson_value * rowV = cson_value_new_object(); |
| 337 | 337 |
| --- src/json_timeline.c | |
| +++ src/json_timeline.c | |
| @@ -326,11 +326,11 @@ | |
| 326 | " blob.uuid as uuid," |
| 327 | " (SELECT uuid FROM blob WHERE rid=pid) as parent," |
| 328 | " blob.size as size" |
| 329 | " FROM mlink, blob" |
| 330 | " WHERE mid=%d AND pid!=fid" |
| 331 | " AND blob.rid=fid " |
| 332 | " ORDER BY name /*sort*/", |
| 333 | rid |
| 334 | ); |
| 335 | while( (SQLITE_ROW == db_step(&q)) ){ |
| 336 | cson_value * rowV = cson_value_new_object(); |
| 337 |
| --- src/json_timeline.c | |
| +++ src/json_timeline.c | |
| @@ -326,11 +326,11 @@ | |
| 326 | " blob.uuid as uuid," |
| 327 | " (SELECT uuid FROM blob WHERE rid=pid) as parent," |
| 328 | " blob.size as size" |
| 329 | " FROM mlink, blob" |
| 330 | " WHERE mid=%d AND pid!=fid" |
| 331 | " AND blob.rid=fid AND NOT mlink.isaux" |
| 332 | " ORDER BY name /*sort*/", |
| 333 | rid |
| 334 | ); |
| 335 | while( (SQLITE_ROW == db_step(&q)) ){ |
| 336 | cson_value * rowV = cson_value_new_object(); |
| 337 |