Fossil

Check-in [2f07c443]
Login

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

Overview
Comment:Fix some compilation issues, related to merging.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | stash-fixes
Files: files | file ages | folders
SHA1:2f07c443fbf8a94c55034ae3dc04d25e8786bde4
User & Date: mistachkin 2016-09-26 21:16:01
Context
2016-10-05
03:03
Merge latest updates from trunk. check-in: 4c197114 user: andybradford tags: stash-fixes
2016-09-26
21:16
Fix some compilation issues, related to merging. check-in: 2f07c443 user: mistachkin tags: stash-fixes
21:12
Merge updates from trunk. check-in: 80aaef52 user: mistachkin tags: stash-fixes
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/stash.c.

489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
  db_begin_transaction();
  db_multi_exec(zStashInit /*works-like:""*/);
  rc = db_exists("SELECT 1 FROM sqlite_master"
                 " WHERE name='stashfile'"
                 "   AND sql GLOB '* PRIMARY KEY(origname, stashid)*'");
  if( rc!=0 ){
    db_multi_exec(
      "CREATE TABLE \"%w\".stashfile_tmp AS SELECT * FROM stashfile;"
      "DROP TABLE stashfile;", zDb
    );
    db_multi_exec(zStashInit /*works-like:"%w,%w"*/, zDb, zDb);
    db_multi_exec(
      "INSERT INTO stashfile SELECT * FROM stashfile_tmp;"
      "DROP TABLE stashfile_tmp;"
    );
  }
  if( g.argc<=2 ){
    zCmd = "save";







|
|

|







489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
  db_begin_transaction();
  db_multi_exec(zStashInit /*works-like:""*/);
  rc = db_exists("SELECT 1 FROM sqlite_master"
                 " WHERE name='stashfile'"
                 "   AND sql GLOB '* PRIMARY KEY(origname, stashid)*'");
  if( rc!=0 ){
    db_multi_exec(
      "CREATE TABLE localdb.stashfile_tmp AS SELECT * FROM stashfile;"
      "DROP TABLE stashfile;"
    );
    db_multi_exec(zStashInit /*works-like:""*/);
    db_multi_exec(
      "INSERT INTO stashfile SELECT * FROM stashfile_tmp;"
      "DROP TABLE stashfile_tmp;"
    );
  }
  if( g.argc<=2 ){
    zCmd = "save";