Fossil SCM
Back out check-in [34341a10b45c9ff1] which was incorrect. That check-in was causing incorrect results to display on the diff of an uncommitted merge. Ticket [47d4e76139fd63f2a] is still open.
Commit
1bea7f6959795ef7db52a5d1a82d0cedbaa6d743
Parent
fbddb0890895aa6…
1 file changed
+2
-2
+2
-2
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -204,11 +204,11 @@ | ||
| 204 | 204 | if( !is_a_version(rid) ){ |
| 205 | 205 | fossil_fatal("no such check-in: %s", zFrom); |
| 206 | 206 | } |
| 207 | 207 | load_vfile_from_rid(rid); |
| 208 | 208 | blob_appendf(&sql, |
| 209 | - "SELECT v2.pathname, v2.deleted, v2.chnged, v2.rid==0, v1.mrid" | |
| 209 | + "SELECT v2.pathname, v2.deleted, v2.chnged, v2.rid==0, v1.rid" | |
| 210 | 210 | " FROM vfile v1, vfile v2 " |
| 211 | 211 | " WHERE v1.pathname=v2.pathname AND v1.vid=%d AND v2.vid=%d" |
| 212 | 212 | " AND (v2.deleted OR v2.chnged OR v1.mrid!=v2.rid)" |
| 213 | 213 | "UNION " |
| 214 | 214 | "SELECT pathname, 1, 0, 0, 0" |
| @@ -225,11 +225,11 @@ | ||
| 225 | 225 | " ORDER BY 1", |
| 226 | 226 | rid, vid, rid, vid, vid, rid |
| 227 | 227 | ); |
| 228 | 228 | }else{ |
| 229 | 229 | blob_appendf(&sql, |
| 230 | - "SELECT pathname, deleted, chnged , rid==0, mrid" | |
| 230 | + "SELECT pathname, deleted, chnged , rid==0, rid" | |
| 231 | 231 | " FROM vfile" |
| 232 | 232 | " WHERE vid=%d" |
| 233 | 233 | " AND (deleted OR chnged OR rid==0)" |
| 234 | 234 | " ORDER BY pathname", |
| 235 | 235 | vid |
| 236 | 236 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -204,11 +204,11 @@ | |
| 204 | if( !is_a_version(rid) ){ |
| 205 | fossil_fatal("no such check-in: %s", zFrom); |
| 206 | } |
| 207 | load_vfile_from_rid(rid); |
| 208 | blob_appendf(&sql, |
| 209 | "SELECT v2.pathname, v2.deleted, v2.chnged, v2.rid==0, v1.mrid" |
| 210 | " FROM vfile v1, vfile v2 " |
| 211 | " WHERE v1.pathname=v2.pathname AND v1.vid=%d AND v2.vid=%d" |
| 212 | " AND (v2.deleted OR v2.chnged OR v1.mrid!=v2.rid)" |
| 213 | "UNION " |
| 214 | "SELECT pathname, 1, 0, 0, 0" |
| @@ -225,11 +225,11 @@ | |
| 225 | " ORDER BY 1", |
| 226 | rid, vid, rid, vid, vid, rid |
| 227 | ); |
| 228 | }else{ |
| 229 | blob_appendf(&sql, |
| 230 | "SELECT pathname, deleted, chnged , rid==0, mrid" |
| 231 | " FROM vfile" |
| 232 | " WHERE vid=%d" |
| 233 | " AND (deleted OR chnged OR rid==0)" |
| 234 | " ORDER BY pathname", |
| 235 | vid |
| 236 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -204,11 +204,11 @@ | |
| 204 | if( !is_a_version(rid) ){ |
| 205 | fossil_fatal("no such check-in: %s", zFrom); |
| 206 | } |
| 207 | load_vfile_from_rid(rid); |
| 208 | blob_appendf(&sql, |
| 209 | "SELECT v2.pathname, v2.deleted, v2.chnged, v2.rid==0, v1.rid" |
| 210 | " FROM vfile v1, vfile v2 " |
| 211 | " WHERE v1.pathname=v2.pathname AND v1.vid=%d AND v2.vid=%d" |
| 212 | " AND (v2.deleted OR v2.chnged OR v1.mrid!=v2.rid)" |
| 213 | "UNION " |
| 214 | "SELECT pathname, 1, 0, 0, 0" |
| @@ -225,11 +225,11 @@ | |
| 225 | " ORDER BY 1", |
| 226 | rid, vid, rid, vid, vid, rid |
| 227 | ); |
| 228 | }else{ |
| 229 | blob_appendf(&sql, |
| 230 | "SELECT pathname, deleted, chnged , rid==0, rid" |
| 231 | " FROM vfile" |
| 232 | " WHERE vid=%d" |
| 233 | " AND (deleted OR chnged OR rid==0)" |
| 234 | " ORDER BY pathname", |
| 235 | vid |
| 236 |