[Monotone-commits-diffs] net.venge.monotone: 434dc4ebd6cb5b90bee294639e445553ce1adfd1

[code]

revision:            434dc4ebd6cb5b90bee294639e445553ce1adfd1
date:                2011-01-09T14:59:13
author:              address@hidden
branch:              net.venge.monotone
changelog:
* monotone.texi (command reference): add missing commands

manifest:
format_version "1"

new_manifest [c6d368cded33eac4737b0f5b636379e1b59bf562]

old_revision [c91edf22b20f5a8b750a8a02af763412d6b936e8]

patch "monotone.texi"
 from [9012285c01fcb244c25008f227faeaae3f796db9]
   to [2ea9b672777f1ccde268a8083eb0164200448329]
============================================================
--- monotone.texi	9012285c01fcb244c25008f227faeaae3f796db9
+++ monotone.texi	2ea9b672777f1ccde268a8083eb0164200448329
@@ -5174,9 +5174,24 @@ @section Tree
 originally in @var{sourcebranch}, which is almost certainly not what would be
 intended.
 
address@hidden need merge_into_workspace
address@hidden need migrate_workspace
address@hidden mtn merge_into_workspace @var{revision}
+Merges @var{revision} into the current workspace; the result is not
+committed to the database. There can be no pending changes in the
+current workspace. The workspace's selected branch is not
+changed.
 
+When a later commit is done, both @var{revision} and the workspace's
+base revision will be recorded as parents.
+
+Merge conflicts can occur.
+
address@hidden mtn migrate_workspace @var{[directory]}
+Migrates a workspace directory's metadata to the latest format.
+
+If no directory is given, defaults to the current workspace.
+
+This may be needed when upgrading to a new version of monotone.
+
 @item mtn propagate @var{sourcebranch} @var{destbranch}
 This command takes a unique head from @var{sourcebranch} and merges it
 with a unique head of @var{destbranch}, using the least common
@@ -5380,9 +5395,9 @@ @section Workspace
 explicit pathname changes you wish to commit at some future time, such
 as addition, removal or renaming of files.
 
-As a convenience, the @option{--unknown} option can be used; this
-option will cause all of the files listed by @command{mtn list
-unknown} to be added. @c FIXME: what happens for '--unknown pathname'?
+As a convenience, the @command{--unknown pathname} option can be used;
+this option will cause all of the files listed by @command{mtn list
+unknown pathname} to be added.
 
 While this command places an ``add'' entry on your work list, it does
 not immediately affect your database. When you @command{commit} your
@@ -5396,8 +5411,26 @@ @section Workspace
 directory non-recursively, monotone will warn if the directory has
 any files that would be added by a recursive add.
 
address@hidden need 'attr'
address@hidden mtn attr
+Manage file attributes.
 
+In @command{drop} and @command{get}, if no attribute is specified, the
+command applies to all attributes attached to the file given in
address@hidden  Otherwise it applies only to the attribute specified in
address@hidden
+
+    @table @command
+    @item mtn attr drop @var{path} @var{[attr]}
+    Remove attributes.
+
+    @item mtn attr get @var{path} @var{[attr]}
+    Output the attributes.
+
+    @item mtn attr set @var{path} @var{attr} @var{value}
+    Sets @var{attr} on @var{path} to @var{value}.
+
+   @end table
+
 @item mtn commit
 @itemx mtn commit address@hidden address@hidden
 @itemx mtn commit address@hidden
@@ -5612,13 +5645,16 @@ @section Workspace
 See the @command{undrop} command for undoing a @command{drop} before commit.
 
 @item mtn mkdir [--[no-]respect-ignore] @var{directory...}
-This command creates a directory in the filesystem relative to your
-current location and adds it to your workspace's ``work list''.  The
+This command creates directories in the filesystem relative to your
+current location and adds them to your workspace's ``work list''.  The
 changes are not reflected in your database until such time as you
-perform a commit.  If you use the @option{--no-respect-ignore} flag,
-entries in @file{.mtn-ignore} will not be honored.
address@hidden FIXME: what does it mean to honor .mtn-ignore here?
+perform a commit.
 
+Normally, if any of @var{directory...} are in @file{.mtn-ignore}, this
+command will fail. You can use @option{--no-respect-ignore} to
+override this check. But it would be better to remove @var{directory}
+from @file{.mtn-ignore}.
+
 @item mtn pivot_root [--bookkeep-only] [--[no-]move-conflicting-paths] @var{new_root} @var{put_old}
 Most users will never need this command.  It is primarily useful in
 certain tricky cases where one wishes to combine several projects
@@ -6147,7 +6183,8 @@ @section Informative
 passed to it, and so on, are controlled by the hook
 @code{external_diff}; see @ref{Hooks} for more details.
 
address@hidden FIXME: need help
address@hidden mtn help [--[no]-hidden] @var{command...}
+Displays help about commands and options.
 
 @item mtn list branches address@hidden address@hidden
 @itemx mtn ls
@@ -6450,8 +6487,18 @@ @section Informative
 Specifying only the pathname "." will restrict @command{status} to files
 changed within the current subdirectory of the workspace.
 
address@hidden FIXME: need version
address@hidden mtn version [--full | --concise]
+Shows the program version.
 
+The concise version is one line, for example:
address@hidden
+monotone 1.0dev (base revision: c91edf22b20f5a8b750a8a02af763412d6b936e8)
address@hidden example
+
+The full version gives more information, including a changelist of the
+monotone source tree from the base revision at the time the executable
+was compiled.
+
 @end ftable
 
 @node    Review, Variables, Informative, Command Reference
@@ -6712,7 +6759,12 @@ @section Database
 @section Database
 
 @ftable @command
address@hidden FIXME: need changesetify
address@hidden mtn db changesetify
+Converts the database to the changeset format.
+
+This is only needed when upgrading very old monotone databases,
+created with monotone versions less than 0.15.
+
 @item mtn db check address@hidden
 
 Monotone always works hard to verify the data it creates and accesses.
@@ -6866,11 +6918,20 @@ @section Database
 form.  It can be used to investigate the state of your database, or
 help diagnose failures.
 
address@hidden FIXME: need mtn db fix_certs
address@hidden mtn db fix_certs [--drop-bad-certs]
+Attempt to fix bad certs.
 
+Older monotone versions could sometimes associate certs with the wrong
+key. This fixes such certs if you have the correct key, and if
address@hidden is given, drops any certs that you don't
+have the correct key for. This should only be needed if you had such
+certs in your db when upgrading from monotone 0.44 or earlier, or if
+you loaded such certs with 'mtn read'.
+
 @item mtn db info address@hidden
-This command prints information about the monotone database @var{dbfile},
-including its schema version and various table size statistics.
+This command prints information about the monotone database
address@hidden, including its schema version and various table size
+statistics.
 
 @item mtn db init address@hidden
 This command initializes a new monotone database at @var{dbfile}.
@@ -6894,10 +6955,21 @@ @section Database
 a copy of it before migrating, in case there is an untrapped error
 during migration.
 
address@hidden FIXME: need mtn db regenerate_caches
address@hidden FIXME: need mtn db rosterify
address@hidden FIXME: need mtn db set_epoch
address@hidden mtn db regenerate_caches
+Regenerates the caches stored in the database.
 
+This is only needed to recover from a newly discovered bug in
+monotone, or if your database becomes corrupted for some other reason.
+
address@hidden mtn db rosterify
+Converts the database to the rosters format.
+
+This is only needed when upgrading very old monotone databases,
+created with monotone versions less than 0.15.
+
address@hidden mtn db set_epoch @var{branch} @var{epoch}
+Sets the branch's epoch. @ref{Rebuilding ancestry} for discussion of epochs.
+
 @item mtn db version address@hidden
 This command prints out just the schema version of the monotone
 database @var{dbfile}.
@@ -12803,7 +12875,7 @@ @heading Filenames
 processing is performed by boost::filesystem.
 
 @item
-FIXME: Monotone does not properly handle case insensitivity on Windows.
+Monotone does not properly handle case insensitivity on Windows.
 
 @item
 A filename (in normal form) is constrained to be a nonempty sequence