Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Comment: | Fix "json timeline" to don't show duplicate files in some chek-ins with merge. Same way CLI timeline was fix on [3c34db8d]. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
26d903de0c1f17f8d7e528621dd429ff |
User & Date: | mgagnon 2015-10-24 14:10:21 |
2015-10-26
| ||
01:18 | Skip diff for files that are ADDED_BY_INTEGRATE. ... (check-in: a6b999ce user: mistachkin tags: trunk) | |
2015-10-24
| ||
14:10 | Fix "json timeline" to don't show duplicate files in some chek-ins with merge. Same way CLI timeline was fix on [3c34db8d]. ... (check-in: 26d903de user: mgagnon tags: trunk) | |
2015-10-22
| ||
11:36 | Cherry-pick unrelated comment fixes from "pending_review" branch. ... (check-in: c1c8d728 user: jan.nijtmans tags: trunk) | |
Changes to src/json_timeline.c.
324 325 326 327 328 329 330 | " (fid==0) AS isdel," " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name," " blob.uuid as uuid," " (SELECT uuid FROM blob WHERE rid=pid) as parent," " blob.size as size" " FROM mlink, blob" " WHERE mid=%d AND pid!=fid" | | | 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 | " (fid==0) AS isdel," " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name," " blob.uuid as uuid," " (SELECT uuid FROM blob WHERE rid=pid) as parent," " blob.size as size" " FROM mlink, blob" " WHERE mid=%d AND pid!=fid" " AND blob.rid=fid AND NOT mlink.isaux" " ORDER BY name /*sort*/", rid ); while( (SQLITE_ROW == db_step(&q)) ){ cson_value * rowV = cson_value_new_object(); cson_object * row = cson_value_get_object(rowV); int const isNew = db_column_int(&q,0); |