Fossil

Check-in [3eec7999]
Login

Check-in [3eec7999]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix the --differ option on "fossil changes" which was broken in the 1.37 release.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 3eec799992757443d2bb592bccb5c225f69a31f6
User & Date: drh 2017-01-18 12:40:05
Context
2017-01-27
12:26
(cherry-pick): Fix the --differ option on "fossil changes" which was broken in the 1.37 release. Openssl 1.0.2j -> 1.0.2k ... (check-in: 86db9145 user: jan.nijtmans tags: branch-1.37)
2017-01-19
13:46
Update the "search" command to honor the -R option. ... (check-in: 377fbf2c user: drh tags: trunk)
2017-01-18
12:40
Fix the --differ option on "fossil changes" which was broken in the 1.37 release. ... (check-in: 3eec7999 user: drh tags: trunk)
2017-01-17
03:10
Updates to the Win32 version resource. ... (check-in: 8dc5d4fc user: mistachkin tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

︙︙
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183


  /* If C_EXTRA, add unmanaged files to the query result too. */
  if( flags & C_EXTRA ){
    if( blob_size(&sql) ){
      blob_append_sql(&sql, " UNION ALL");
    }
    blob_append_sql(&sql,
      " SELECT pathname, %s, %s, 0, 0, 0, 0, 0, 0"
      " FROM sfile WHERE pathname NOT IN (%s)%s",
      flags & C_MTIME ? "datetime(mtime, 'unixepoch', toLocal())" : "''",
      flags & C_SIZE ? "size" : "0",
      fossil_all_reserved_names(0), blob_sql_text(&where));
  }
  blob_reset(&where);









|








169
170
171
172
173
174
175
176
177
178
179
180
181
182
183


  /* If C_EXTRA, add unmanaged files to the query result too. */
  if( flags & C_EXTRA ){
    if( blob_size(&sql) ){
      blob_append_sql(&sql, " UNION ALL");
    }
    blob_append_sql(&sql,
      " SELECT pathname, %s, %s, 0, 0, 0, 0, 0"
      " FROM sfile WHERE pathname NOT IN (%s)%s",
      flags & C_MTIME ? "datetime(mtime, 'unixepoch', toLocal())" : "''",
      flags & C_SIZE ? "size" : "0",
      fossil_all_reserved_names(0), blob_sql_text(&where));
  }
  blob_reset(&where);
︙︙