Differences From:

File src/db.c part of check-in [097479f99a] - Better defaults for new databases and clones. Use *CURRENT* to identify the current checkout for TTY timelines. by drh on 2007-09-26 02:00:26. [view]

To:

File src/db.c part of check-in [41561125cd] - Added safemerge option to commit, update and settings by jnc on 2007-09-26 04:17:37. [view]

@@ -695,8 +695,9 @@
       " VALUES('project-code', lower(hex(randomblob(20))));"
     );
   }
   db_set_int("autosync", 1);
+  db_set_int("safemerge", 0);
   db_set_int("localauth", 0);
   zUser = db_global_get("default-user", 0);
   if( zUser==0 ){
     zUser = getenv("USER");
@@ -919,8 +920,11 @@
 **   editor        Text editor command used for check-in comments.
 **
 **   clear-sign    Command used to clear-sign manifests at check-in.
 **                 The default is "gpg --clearsign -o ".
+**
+**   omit-sign     When enabled, fossil will not attempt to sign any
+**                 commit with gpg. All commits will be unsigned.
 */
 void cmd_config(void){
   db_open_config();
   if( g.argc>2 ){
@@ -975,17 +979,22 @@
 **    autosync         If enabled, automatically pull prior to
 **                     commit or update and automatically push
 **                     after commit or tag or branch creation.
 **
-**    localauth        If true, require that HTTP connections from
+**    localauth        If enabled, require that HTTP connections from
 **                     127.0.0.1 be authenticated by password.  If
 **                     false, all HTTP requests from localhost have
 **                     unrestricted access to the repository.
+**
+**    safemerge        If enabled, when commit will cause a fork, the
+**                     commit will not abort with warning. Also update
+**                     will not be allowed if local changes exist.
 */
 void setting_cmd(void){
   static const char *azName[] = {
     "autosync",
-    "localauth"
+    "localauth",
+    "safemerge",
   };
   int i;
   db_find_and_open_repository();
   if( g.argc==2 ){