Fossil

Check-in [e2a73756]
Login

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

Overview
Comment:Minor comment changes.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | rid-renumbering
Files: files | file ages | folders
SHA3-256: e2a73756c5bbbc1a8d9f5d7b1f1c3e21be35d7034e058249e1804cdddb747818
User & Date: drh 2019-01-20 23:42:00
Context
2019-01-20
23:58
Pick up the cherrypick merge arrow display fix from trunk. Closed-Leaf check-in: 12a022b1 user: drh tags: rid-renumbering
23:42
Minor comment changes. check-in: e2a73756 user: drh tags: rid-renumbering
21:29
Automatically update the VFILE and VMERGE tables when the fingerprinting detects that a repository has been replaced by clone. check-in: b0365238 user: drh tags: rid-renumbering
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/db.c.

  1479   1479     if( file_access(zDbName, F_OK) ) return 0;
  1480   1480     lsize = file_size(zDbName, ExtFILE);
  1481   1481     if( lsize%1024!=0 || lsize<4096 ) return 0;
  1482   1482     db_open_or_attach(zDbName, "localdb");
  1483   1483   
  1484   1484     /* Check to see if the checkout database has the lastest schema changes.
  1485   1485     ** The most recent schema change (2019-01-19) is the addition of the
  1486         -  ** vmerge.mhash field.  If the schema has that one column, assume
  1487         -  ** everything else is up-to-date. 
         1486  +  ** vmerge.mhash and vfile.mhash fields.  If the schema has the vmerge.mhash
         1487  +  ** column, assume everything else is up-to-date. 
  1488   1488     */
  1489   1489     if( db_table_has_column("localdb","vmerge","mhash") ){
  1490   1490       return 1;   /* This is a checkout database with the latest schema */
  1491   1491     }
  1492   1492   
  1493   1493     /* If there is no vfile table, then assume we have picked up something
  1494   1494     ** that is not even close to being a valid checkout database */
................................................................................
  1517   1517         db_multi_exec("ALTER TABLE undo ADD COLUMN isLink BOOLEAN DEFAULT 0");
  1518   1518       }
  1519   1519       if( db_local_table_exists_but_lacks_column("undo_vfile", "islink") ){
  1520   1520         db_multi_exec("ALTER TABLE undo_vfile ADD COLUMN islink BOOL DEFAULT 0");
  1521   1521       }
  1522   1522     }
  1523   1523   
  1524         -  /* The design of the vmerge table changed on 2019-01-19, adding the mhash
  1525         -  ** column and changing the UNIQUE index.  However, we must ahve the
  1526         -  ** repository database at hand in order to do the migration, so that
         1524  +  /* The design of the checkout database changed on 2019-01-19, adding the mhash
         1525  +  ** column to vfile and vmerge and changing the UNIQUE index on vmerge into
         1526  +  ** a PRIMARY KEY that includes the new mhash column.  However, we must have
         1527  +  ** the repository database at hand in order to do the migration, so that
  1527   1528     ** step is deferred. */
  1528   1529     return 1;
  1529   1530   }
  1530   1531   
  1531   1532   /*
  1532   1533   ** Locate the root directory of the local repository tree.  The root
  1533   1534   ** directory is found by searching for a file named "_FOSSIL_" or ".fslckout"