# # # patch "monotone.texi" # from [cc29afef4a5d798896ea7403f747576293b2b4fe] # to [cc1531e4d7a48c6b346924e6091e7e08790bfca2] # ============================================================ --- monotone.texi cc29afef4a5d798896ea7403f747576293b2b4fe +++ monotone.texi cc1531e4d7a48c6b346924e6091e7e08790bfca2 @@ -3679,6 +3679,39 @@ @heading Committing Changes database. A separate command, @command{push}, sends the changes to a remote database. address@hidden Undoing Changes + address@hidden @columnfractions .4 .4 address@hidden address@hidden address@hidden +$ cvs update -C file address@hidden group address@hidden smallexample address@hidden address@hidden address@hidden +$ mtn revert file address@hidden group address@hidden smallexample address@hidden multitable + +Unlike CVS, monotone includes a separate @command{revert} command for +undoing local changes and restoring the workspace to the original +contents of the base revision. Because this can be dangerous, address@hidden insists on an explicit argument to name the files or +directories to be reverted; use the current directory "@file{.}" at the +top of the workspace to revert everything. The @command{revert} command +is also used to restore deleted files (with a convenient @command{update +--missing} shortcut for naming these files). + +In CVS, you would need to use @command{update} to restore missing or +changed files, and you might get back a newer version of the file than +you started with. In monotone, @command{revert} always takes you back to +where you started, and the @command{update} command is only used to move +the workspace to a different (usually newer) base revision. + + @heading Incorporating New Changes @multitable @columnfractions .4 .4