Fossil SCM
Take care not to show null-diffs with the "diff" command when the checkout contains the results of a merge.
Commit
34341a10b45c9ff1f92c895ace54f021e5eef73e
Parent
20b04536d0c9ab0…
1 file changed
+3
-3
+3
-3
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -196,14 +196,14 @@ | ||
| 196 | 196 | if( !is_a_version(rid) ){ |
| 197 | 197 | fossil_fatal("no such check-in: %s", zFrom); |
| 198 | 198 | } |
| 199 | 199 | load_vfile_from_rid(rid); |
| 200 | 200 | blob_appendf(&sql, |
| 201 | - "SELECT v2.pathname, v2.deleted, v2.chnged, v2.rid==0, v1.rid" | |
| 201 | + "SELECT v2.pathname, v2.deleted, v2.chnged, v2.rid==0, v1.mrid" | |
| 202 | 202 | " FROM vfile v1, vfile v2 " |
| 203 | 203 | " WHERE v1.pathname=v2.pathname AND v1.vid=%d AND v2.vid=%d" |
| 204 | - " AND (v2.deleted OR v2.chnged OR v1.rid!=v2.rid)" | |
| 204 | + " AND (v2.deleted OR v2.chnged OR v1.mrid!=v2.rid)" | |
| 205 | 205 | "UNION " |
| 206 | 206 | "SELECT pathname, 1, 0, 0, 0" |
| 207 | 207 | " FROM vfile v1" |
| 208 | 208 | " WHERE v1.vid=%d" |
| 209 | 209 | " AND NOT EXISTS(SELECT 1 FROM vfile v2" |
| @@ -217,11 +217,11 @@ | ||
| 217 | 217 | " ORDER BY 1", |
| 218 | 218 | rid, vid, rid, vid, vid, rid |
| 219 | 219 | ); |
| 220 | 220 | }else{ |
| 221 | 221 | blob_appendf(&sql, |
| 222 | - "SELECT pathname, deleted, chnged , rid==0, rid" | |
| 222 | + "SELECT pathname, deleted, chnged , rid==0, mrid" | |
| 223 | 223 | " FROM vfile" |
| 224 | 224 | " WHERE vid=%d" |
| 225 | 225 | " AND (deleted OR chnged OR rid==0)" |
| 226 | 226 | " ORDER BY pathname", |
| 227 | 227 | vid |
| 228 | 228 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -196,14 +196,14 @@ | |
| 196 | if( !is_a_version(rid) ){ |
| 197 | fossil_fatal("no such check-in: %s", zFrom); |
| 198 | } |
| 199 | load_vfile_from_rid(rid); |
| 200 | blob_appendf(&sql, |
| 201 | "SELECT v2.pathname, v2.deleted, v2.chnged, v2.rid==0, v1.rid" |
| 202 | " FROM vfile v1, vfile v2 " |
| 203 | " WHERE v1.pathname=v2.pathname AND v1.vid=%d AND v2.vid=%d" |
| 204 | " AND (v2.deleted OR v2.chnged OR v1.rid!=v2.rid)" |
| 205 | "UNION " |
| 206 | "SELECT pathname, 1, 0, 0, 0" |
| 207 | " FROM vfile v1" |
| 208 | " WHERE v1.vid=%d" |
| 209 | " AND NOT EXISTS(SELECT 1 FROM vfile v2" |
| @@ -217,11 +217,11 @@ | |
| 217 | " ORDER BY 1", |
| 218 | rid, vid, rid, vid, vid, rid |
| 219 | ); |
| 220 | }else{ |
| 221 | blob_appendf(&sql, |
| 222 | "SELECT pathname, deleted, chnged , rid==0, rid" |
| 223 | " FROM vfile" |
| 224 | " WHERE vid=%d" |
| 225 | " AND (deleted OR chnged OR rid==0)" |
| 226 | " ORDER BY pathname", |
| 227 | vid |
| 228 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -196,14 +196,14 @@ | |
| 196 | if( !is_a_version(rid) ){ |
| 197 | fossil_fatal("no such check-in: %s", zFrom); |
| 198 | } |
| 199 | load_vfile_from_rid(rid); |
| 200 | blob_appendf(&sql, |
| 201 | "SELECT v2.pathname, v2.deleted, v2.chnged, v2.rid==0, v1.mrid" |
| 202 | " FROM vfile v1, vfile v2 " |
| 203 | " WHERE v1.pathname=v2.pathname AND v1.vid=%d AND v2.vid=%d" |
| 204 | " AND (v2.deleted OR v2.chnged OR v1.mrid!=v2.rid)" |
| 205 | "UNION " |
| 206 | "SELECT pathname, 1, 0, 0, 0" |
| 207 | " FROM vfile v1" |
| 208 | " WHERE v1.vid=%d" |
| 209 | " AND NOT EXISTS(SELECT 1 FROM vfile v2" |
| @@ -217,11 +217,11 @@ | |
| 217 | " ORDER BY 1", |
| 218 | rid, vid, rid, vid, vid, rid |
| 219 | ); |
| 220 | }else{ |
| 221 | blob_appendf(&sql, |
| 222 | "SELECT pathname, deleted, chnged , rid==0, mrid" |
| 223 | " FROM vfile" |
| 224 | " WHERE vid=%d" |
| 225 | " AND (deleted OR chnged OR rid==0)" |
| 226 | " ORDER BY pathname", |
| 227 | vid |
| 228 |