Fossil

Check-in [af50b29c]
Login

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

Overview
Comment:Merge the msw-hack branch into trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: af50b29c987eb35fca1268448ba90e2766b68492
User & Date: drh 2011-08-22 18:23:08
Context
2011-08-22
18:25
Merge the --showfiles enhancement from the venks-emacs branch into trunk. check-in: 2b8cbf3c user: drh tags: trunk
18:23
Merge the msw-hack branch into trunk. check-in: af50b29c user: drh tags: trunk
15:55
Continue with the update routine even if the targetted version equals the current checkout version instead of depending on the value of the verbose flag to continue or not. This fixes tkt [e8a10100e2]. Fossil update will now recover lost files with or without the -v flag. check-in: c6b371c4 user: martin.weber tags: msw-hack
2011-08-16
02:43
Update the built-in SQLite to the latest pre-3.7.8 version from the stat3-enhancement branch. And turn on SQLITE_ENABLE_STAT3. This will serve as a test of the stat3 enhancements to SQLite. check-in: ce62a2b1 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/update.c.

183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
    if( tid==0 ) tid = vid;
  }

  if( tid==0 ){
    fossil_panic("Internal Error: unable to find a version to update to.");
  }

  if( tid==vid && !verboseFlag ) return;  /* Nothing to update */
  db_begin_transaction();
  vfile_check_signature(vid, 1, 0);
  if( !nochangeFlag && !internalUpdate ) undo_begin();
  load_vfile_from_rid(tid);

  /*
  ** The record.fn field is used to match files against each other.  The







<







183
184
185
186
187
188
189

190
191
192
193
194
195
196
    if( tid==0 ) tid = vid;
  }

  if( tid==0 ){
    fossil_panic("Internal Error: unable to find a version to update to.");
  }


  db_begin_transaction();
  vfile_check_signature(vid, 1, 0);
  if( !nochangeFlag && !internalUpdate ) undo_begin();
  load_vfile_from_rid(tid);

  /*
  ** The record.fn field is used to match files against each other.  The