Fossil

Check-in [a435ae67]
Login

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

Overview
Comment:Call vfile_check_signature before creating a stash, to make sure that all changed files have been stashed. Ticket [bfef8e4f89cd4b161a584]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:a435ae67a97b5369f8096d91834ccb7ce8f5ea22
User & Date: drh 2011-01-18 18:36:59
Context
2011-01-18
18:58
Add --host and --https options to the http command. Ticket [0ffa37e70e885cfc]. check-in: ff0e506e user: drh tags: trunk
18:36
Call vfile_check_signature before creating a stash, to make sure that all changed files have been stashed. Ticket [bfef8e4f89cd4b161a584] check-in: a435ae67 user: drh tags: trunk
18:36
Remote the number of merge conflicts on an update. Ticket [769b4ed7b23e4cb7] check-in: 0b8aed94 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/stash.c.

143
144
145
146
147
148
149

150
151
152
153
154
155
156
  int vid;                           /* Current checkout */

  zComment = find_option("comment", "m", 1);
  verify_all_options();
  stashid = db_lget_int("stash-next", 1);
  db_lset_int("stash-next", stashid+1);
  vid = db_lget_int("checkout", 0);

  db_multi_exec(
    "INSERT INTO stash(stashid,vid,comment,ctime)"
    "VALUES(%d,%d,%Q,julianday('now'))",
    stashid, vid, zComment
  );
  if( g.argc>3 ){
    int i;







>







143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
  int vid;                           /* Current checkout */

  zComment = find_option("comment", "m", 1);
  verify_all_options();
  stashid = db_lget_int("stash-next", 1);
  db_lset_int("stash-next", stashid+1);
  vid = db_lget_int("checkout", 0);
  vfile_check_signature(vid, 0, 0);
  db_multi_exec(
    "INSERT INTO stash(stashid,vid,comment,ctime)"
    "VALUES(%d,%d,%Q,julianday('now'))",
    stashid, vid, zComment
  );
  if( g.argc>3 ){
    int i;