Fossil

Check-in [fea4d80e]
Login

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

Overview
Comment:If a file has been renamed in a stash, restore this information also in the vfile table so it doesn't show up as MISSING.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | stash-fixes
Files: files | file ages | folders
SHA1:fea4d80ee7b880bb9f91d663613e0c4777d6ac45
User & Date: andybradford 2016-02-13 05:00:38
References
2016-02-13
06:57
Updated stash.test to reflect the incidental changes in output caused by the changes made in [fea4d80ee7]. check-in: a9afb1f0 user: rberteig tags: stash-fixes
Context
2016-02-13
06:57
Updated stash.test to reflect the incidental changes in output caused by the changes made in [fea4d80ee7]. check-in: a9afb1f0 user: rberteig tags: stash-fixes
05:00
If a file has been renamed in a stash, restore this information also in the vfile table so it doesn't show up as MISSING. check-in: fea4d80e user: andybradford tags: stash-fixes
02:42
More fossil stash cases, this time with snapshot and interesting results of fossil stash diff in when a DELETE was snapshotted. check-in: 94b95307 user: rberteig tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/stash.c.

276
277
278
279
280
281
282





283
284
285
286
287
288
289
      blob_reset(&b);
      blob_reset(&disk);
    }
    blob_reset(&delta);
    if( fossil_strcmp(zOrig,zNew)!=0 ){
      undo_save(zOrig);
      file_delete(zOPath);





    }
  }
  stash_add_files_in_sfile(vid);
  db_finalize(&q);
  if( nConflict ){
    fossil_print(
      "WARNING: %d merge conflicts - see messages above for details.\n",







>
>
>
>
>







276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
      blob_reset(&b);
      blob_reset(&disk);
    }
    blob_reset(&delta);
    if( fossil_strcmp(zOrig,zNew)!=0 ){
      undo_save(zOrig);
      file_delete(zOPath);
      db_multi_exec(
        "UPDATE vfile SET pathname='%q', origname='%q'"
        " WHERE pathname='%q' %s AND vid=%d",
        zNew, zOrig, zOrig, filename_collation(), vid
      );
    }
  }
  stash_add_files_in_sfile(vid);
  db_finalize(&q);
  if( nConflict ){
    fossil_print(
      "WARNING: %d merge conflicts - see messages above for details.\n",