Differences From:

File src/checkin.c part of check-in [f6d507179e] - Fix an SQL syntax error in the commit logic introduced by check-in b6e22e62cf26115617822c7940cec5d0dc687184. by drh on 2009-01-21 00:05:35. [view]

To:

File src/checkin.c part of check-in [8d5ab7913e] - Do not print a warning about "a fork has occurred" when checking in to a leaf that is also the basis of a branch. by drh on 2009-01-21 03:12:14. [view]

@@ -645,9 +645,9 @@
   /* Commit */
   db_end_transaction(0);
 
   autosync(AUTOSYNC_PUSH);
-  if( db_exists("SELECT 1 FROM plink WHERE pid=%d AND cid!=%d", vid, nvid) ){
+  if( count_nonbranch_children(vid)>1 ){
     printf("**** warning: a fork has occurred *****\n");
   }
 }