Differences From:

File src/update.c part of check-in [fe6ee8a431] - Do not remove files that have been edited when doing an "update". Instead, mark the files as CONFLICT. by drh on 2007-08-08 15:30:04. [view]

To:

File src/update.c part of check-in [6607844a01] - Added options to the "timeline" CLI command. Additional help comments. by drh on 2007-08-18 11:42:24. [view]

@@ -30,12 +30,17 @@
 
 /*
 ** COMMAND: update
 **
+** Usage: %fossil update ?VERSION?
+**
 ** The optional argument is a version that should become the current
 ** version.  If the argument is omitted, then use the leaf of the
-** version tree branch that begins with the current version, if there
-** is only a single leaf.
+** tree that begins with the current version, if there is only a
+** single leaf.
+**
+** This command is different from the "checkout" in that edits are
+** not overwritten.  Edits are merged into the new version.
 **
 */
 void update_cmd(void){
   int vid;              /* Current version */