Differences From:

File src/update.c part of check-in [b6e22e62cf] - Attempting to rationalize the tagging and branching logic. The "branch" command has been resurrected and appears to work now. The "tag branch" command has been removed. Special tags "newbranch" and "closed" used to manage branches. New changes are not well-tested - use with caution. You must "rebuild" when upgrading through this version. by drh on 2009-01-20 16:51:19. [view]

To:

File src/update.c part of check-in [7a2c37063a] - merge trunk into creole branch by bob on 2009-09-22 07:49:39. Also file src/update.c part of check-in [e124881a70] - Fix the "update" command so that is does not report conflicts on files that have been added to the current check-out but not yet committed. The added files are simply carried forward into the updated version. by drh on 2009-07-07 14:53:58. [view]

@@ -188,9 +188,13 @@
       printf("UPDATE %s\n", zName);
       undo_save(zName);
       vfile_to_disk(0, idt, 0);
     }else if( idt==0 && idv>0 ){
-      if( chnged ){
+      if( ridv==0 ){
+        /* Added in current checkout.  Continue to hold the file as
+        ** as an addition */
+        db_multi_exec("UPDATE vfile SET vid=%d WHERE id=%d", tid, idv);
+      }else if( chnged ){
         printf("CONFLICT %s\n", zName);
       }else{
         char *zFullPath;
         printf("REMOVE %s\n", zName);