Fossil SCM
On the check-in information page, only show diffs for changes from the primary parent. Omit diffs of changes from merged in nodes.
Commit
49976900788c76813f80f226bdc9661dc7dee99d
Parent
d4d6a8432b9bfe4…
1 file changed
+1
-1
+1
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -714,11 +714,11 @@ | ||
| 714 | 714 | " mperm," |
| 715 | 715 | " (SELECT uuid FROM blob WHERE rid=mlink.pid)," |
| 716 | 716 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 717 | 717 | " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)" |
| 718 | 718 | " FROM mlink JOIN filename ON filename.fnid=mlink.fnid" |
| 719 | - " WHERE mlink.mid=%d" | |
| 719 | + " WHERE mlink.mid=%d AND NOT mlink.isaux" | |
| 720 | 720 | " AND (mlink.fid>0" |
| 721 | 721 | " OR mlink.fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=%d))" |
| 722 | 722 | " ORDER BY name /*sort*/", |
| 723 | 723 | rid, rid |
| 724 | 724 | ); |
| 725 | 725 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -714,11 +714,11 @@ | |
| 714 | " mperm," |
| 715 | " (SELECT uuid FROM blob WHERE rid=mlink.pid)," |
| 716 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 717 | " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)" |
| 718 | " FROM mlink JOIN filename ON filename.fnid=mlink.fnid" |
| 719 | " WHERE mlink.mid=%d" |
| 720 | " AND (mlink.fid>0" |
| 721 | " OR mlink.fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=%d))" |
| 722 | " ORDER BY name /*sort*/", |
| 723 | rid, rid |
| 724 | ); |
| 725 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -714,11 +714,11 @@ | |
| 714 | " mperm," |
| 715 | " (SELECT uuid FROM blob WHERE rid=mlink.pid)," |
| 716 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 717 | " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)" |
| 718 | " FROM mlink JOIN filename ON filename.fnid=mlink.fnid" |
| 719 | " WHERE mlink.mid=%d AND NOT mlink.isaux" |
| 720 | " AND (mlink.fid>0" |
| 721 | " OR mlink.fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=%d))" |
| 722 | " ORDER BY name /*sort*/", |
| 723 | rid, rid |
| 724 | ); |
| 725 |