Fossil SCM

Fix the --differ option on "fossil changes" which was broken in the 1.37 release.

drh 2017-01-18 12:40 trunk
Commit 3eec799992757443d2bb592bccb5c225f69a31f6
1 file changed +1 -1
+1 -1
--- src/checkin.c
+++ src/checkin.c
@@ -171,11 +171,11 @@
171171
if( flags & C_EXTRA ){
172172
if( blob_size(&sql) ){
173173
blob_append_sql(&sql, " UNION ALL");
174174
}
175175
blob_append_sql(&sql,
176
- " SELECT pathname, %s, %s, 0, 0, 0, 0, 0, 0"
176
+ " SELECT pathname, %s, %s, 0, 0, 0, 0, 0"
177177
" FROM sfile WHERE pathname NOT IN (%s)%s",
178178
flags & C_MTIME ? "datetime(mtime, 'unixepoch', toLocal())" : "''",
179179
flags & C_SIZE ? "size" : "0",
180180
fossil_all_reserved_names(0), blob_sql_text(&where));
181181
}
182182
--- src/checkin.c
+++ src/checkin.c
@@ -171,11 +171,11 @@
171 if( flags & C_EXTRA ){
172 if( blob_size(&sql) ){
173 blob_append_sql(&sql, " UNION ALL");
174 }
175 blob_append_sql(&sql,
176 " SELECT pathname, %s, %s, 0, 0, 0, 0, 0, 0"
177 " FROM sfile WHERE pathname NOT IN (%s)%s",
178 flags & C_MTIME ? "datetime(mtime, 'unixepoch', toLocal())" : "''",
179 flags & C_SIZE ? "size" : "0",
180 fossil_all_reserved_names(0), blob_sql_text(&where));
181 }
182
--- src/checkin.c
+++ src/checkin.c
@@ -171,11 +171,11 @@
171 if( flags & C_EXTRA ){
172 if( blob_size(&sql) ){
173 blob_append_sql(&sql, " UNION ALL");
174 }
175 blob_append_sql(&sql,
176 " SELECT pathname, %s, %s, 0, 0, 0, 0, 0"
177 " FROM sfile WHERE pathname NOT IN (%s)%s",
178 flags & C_MTIME ? "datetime(mtime, 'unixepoch', toLocal())" : "''",
179 flags & C_SIZE ? "size" : "0",
180 fossil_all_reserved_names(0), blob_sql_text(&where));
181 }
182

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button