Fossil

Check-in [ef27b005]
Login

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

Overview
Comment:Accidentally removed a newline with vi's shift-j. No change in functionality.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | stash_add
Files: files | file ages | folders
SHA1:ef27b0059a0af7fe568dbc8ee51e3860c07413bf
User & Date: andybradford 2014-03-12 04:12:43
Context
2014-03-13
11:58
Fix the stash so that it remembers added files and readds them when the stash is applied. check-in: db052aa4 user: drh tags: trunk
2014-03-12
04:12
Accidentally removed a newline with vi's shift-j. No change in functionality. Closed-Leaf check-in: ef27b005 user: andybradford tags: stash_add
04:08
Make stash_apply handle new files and put them in an ADDED state. check-in: c2d748ae user: andybradford tags: stash_add
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/stash.c.

228
229
230
231
232
233
234

235
236
237
238
239
240
241
242
      db_ephemeral_blob(&q, 6, &delta);
      blob_write_to_file(&delta, zNPath);
      file_wd_setexe(zNPath, isExec);
    }else if( isRemoved ){
      fossil_print("DELETE %s\n", zOrig);
      file_delete(zOPath);
    }else{

      Blob a, b, out, disk; int isNewLink = file_wd_islink(zOPath);
      db_ephemeral_blob(&q, 6, &delta);
      if( isNewLink ){
        blob_read_link(&disk, zOPath);
      }else{
        blob_read_from_file(&disk, zOPath);
      }
      content_get(rid, &a);







>
|







228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
      db_ephemeral_blob(&q, 6, &delta);
      blob_write_to_file(&delta, zNPath);
      file_wd_setexe(zNPath, isExec);
    }else if( isRemoved ){
      fossil_print("DELETE %s\n", zOrig);
      file_delete(zOPath);
    }else{
      Blob a, b, out, disk;
      int isNewLink = file_wd_islink(zOPath);
      db_ephemeral_blob(&q, 6, &delta);
      if( isNewLink ){
        blob_read_link(&disk, zOPath);
      }else{
        blob_read_from_file(&disk, zOPath);
      }
      content_get(rid, &a);