Differences From:

File src/update.c part of check-in [49b59bc559] - Issue a warning after a commit if the commit causes a fork. by drh on 2008-02-09 00:11:04. [view]

To:

File src/update.c part of check-in [33c31f73cd] - Record whether or not files have their execute permission bit set. Set or clear the execute permission bit upon checkout. by drh on 2008-02-21 14:27:34. Also file src/update.c part of check-in [588bb7cd73] - Merged to ed26056bb5. by aku on 2008-02-24 18:50:35. [view]

@@ -68,15 +68,8 @@
   }
   if( db_exists("SELECT 1 FROM vmerge") ){
     fossil_fatal("cannot update an uncommitted merge");
   }
-#if 0
-  /* Always do the update.  If it does not work out, the user can back out
-  ** the changes using "undo" */
-  if( !forceFlag && unsaved_changes() ){
-    fossil_fatal("uncommitted changes; use -f or --force to override");
-  }
-#endif
 
   if( g.argc==3 ){
     tid = name_to_rid(g.argv[2]);
     if( tid==0 ){