Fossil SCM
Fix the show-files option for timelines so that it shows all files affected, even if they are coming in from a merge.
Commit
9431fec1ea098feab24002d4c3bfa0132017ef39
Parent
7428117cbfb3917…
2 files changed
+1
-1
-1
+1
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -738,11 +738,11 @@ | ||
| 738 | 738 | " mperm," |
| 739 | 739 | " (SELECT uuid FROM blob WHERE rid=mlink.pid)," |
| 740 | 740 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 741 | 741 | " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)" |
| 742 | 742 | " FROM mlink JOIN filename ON filename.fnid=mlink.fnid" |
| 743 | - " WHERE mlink.mid=%d AND NOT mlink.isaux" | |
| 743 | + " WHERE mlink.mid=%d" | |
| 744 | 744 | " AND (mlink.fid>0" |
| 745 | 745 | " OR mlink.fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=%d))" |
| 746 | 746 | " ORDER BY name /*sort*/", |
| 747 | 747 | rid, rid |
| 748 | 748 | ); |
| 749 | 749 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -738,11 +738,11 @@ | |
| 738 | " mperm," |
| 739 | " (SELECT uuid FROM blob WHERE rid=mlink.pid)," |
| 740 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 741 | " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)" |
| 742 | " FROM mlink JOIN filename ON filename.fnid=mlink.fnid" |
| 743 | " WHERE mlink.mid=%d AND NOT mlink.isaux" |
| 744 | " AND (mlink.fid>0" |
| 745 | " OR mlink.fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=%d))" |
| 746 | " ORDER BY name /*sort*/", |
| 747 | rid, rid |
| 748 | ); |
| 749 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -738,11 +738,11 @@ | |
| 738 | " mperm," |
| 739 | " (SELECT uuid FROM blob WHERE rid=mlink.pid)," |
| 740 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 741 | " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)" |
| 742 | " FROM mlink JOIN filename ON filename.fnid=mlink.fnid" |
| 743 | " WHERE mlink.mid=%d" |
| 744 | " AND (mlink.fid>0" |
| 745 | " OR mlink.fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=%d))" |
| 746 | " ORDER BY name /*sort*/", |
| 747 | rid, rid |
| 748 | ); |
| 749 |
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -503,11 +503,10 @@ | ||
| 503 | 503 | " (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm" |
| 504 | 504 | " FROM mlink" |
| 505 | 505 | " WHERE mid=:mid AND (pid!=fid OR pfnid>0)" |
| 506 | 506 | " AND (fid>0 OR" |
| 507 | 507 | " fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))" |
| 508 | - " AND NOT mlink.isaux" | |
| 509 | 508 | " ORDER BY 3 /*sort*/" |
| 510 | 509 | ); |
| 511 | 510 | fchngQueryInit = 1; |
| 512 | 511 | } |
| 513 | 512 | db_bind_int(&fchngQuery, ":mid", rid); |
| 514 | 513 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -503,11 +503,10 @@ | |
| 503 | " (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm" |
| 504 | " FROM mlink" |
| 505 | " WHERE mid=:mid AND (pid!=fid OR pfnid>0)" |
| 506 | " AND (fid>0 OR" |
| 507 | " fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))" |
| 508 | " AND NOT mlink.isaux" |
| 509 | " ORDER BY 3 /*sort*/" |
| 510 | ); |
| 511 | fchngQueryInit = 1; |
| 512 | } |
| 513 | db_bind_int(&fchngQuery, ":mid", rid); |
| 514 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -503,11 +503,10 @@ | |
| 503 | " (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm" |
| 504 | " FROM mlink" |
| 505 | " WHERE mid=:mid AND (pid!=fid OR pfnid>0)" |
| 506 | " AND (fid>0 OR" |
| 507 | " fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))" |
| 508 | " ORDER BY 3 /*sort*/" |
| 509 | ); |
| 510 | fchngQueryInit = 1; |
| 511 | } |
| 512 | db_bind_int(&fchngQuery, ":mid", rid); |
| 513 |