Differences From Artifact [4f9de15613]:

• File src/stash.c — part of check-in [eea6449098] at 2011-05-02 13:31:01 on branch windows-i18n — Change calls to unlink() into file_delete(). The file_delete() routine converts filenames to MBCS from UTF if necessary. (user: drh size: 15345) [more...]

To Artifact [a5de7f84ca]:

• File src/stash.c — part of check-in [336e194c4d] at 2011-07-13 21:15:59 on branch trunk — Fix an assert() that fires if the "stash" command is used after having done an "rm". Ticket [3ce0ea97522581] (user: drh size: 15372) [more...]

98
99
100
101
102
103
104

105
106
107
108
109
110
111

    db_bind_text(&ins, ":orig", zOrig);
    db_bind_text(&ins, ":new", zName);
    if( rid==0 ){
      /* A new file */
      blob_read_from_file(&content, zPath);
      db_bind_blob(&ins, ":content", &content);
    }else if( deleted ){

      db_bind_null(&ins, ":content");
    }else{
      /* A modified file */
      Blob orig;
      Blob disk;
      blob_read_from_file(&disk, zPath);
      content_get(rid, &orig);

>

98
99
100
101
102
103
104
105
106
107
108
109
110
111
112

    db_bind_text(&ins, ":orig", zOrig);
    db_bind_text(&ins, ":new", zName);
    if( rid==0 ){
      /* A new file */
      blob_read_from_file(&content, zPath);
      db_bind_blob(&ins, ":content", &content);
    }else if( deleted ){
      blob_zero(&content);
      db_bind_null(&ins, ":content");
    }else{
      /* A modified file */
      Blob orig;
      Blob disk;
      blob_read_from_file(&disk, zPath);
      content_get(rid, &orig);