[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone: af8102fc597d7fc268dff8dbf9
|
From: |
code |
|
Subject: |
[Monotone-commits-diffs] net.venge.monotone: af8102fc597d7fc268dff8dbf95e70e6d9a884c5 |
|
Date: |
Sat, 8 Jan 2011 23:12:15 GMT |
revision: af8102fc597d7fc268dff8dbf95e70e6d9a884c5
date: 2011-01-08T23:10:15
author: address@hidden
branch: net.venge.monotone
changelog:
merge of '3286bf297630920b205f4730823ae09a6317cde5'
and 'aa2c6114728487bfd77df1a37f53152a7187c09a'
manifest:
format_version "1"
new_manifest [0f6869b3480b2b60b58690fd00b7749643e21036]
old_revision [3286bf297630920b205f4730823ae09a6317cde5]
patch "monotone.texi"
from [6e40ba913379aa4946cf22477ffac133c2d28f9d]
to [68434cc3c9a0051f28fe4cb0031c73456889586f]
old_revision [aa2c6114728487bfd77df1a37f53152a7187c09a]
patch "monotone.texi"
from [d4c3b0f9d5e1df4d3424893864bc7e76a50a04a7]
to [68434cc3c9a0051f28fe4cb0031c73456889586f]
============================================================
--- monotone.texi 6e40ba913379aa4946cf22477ffac133c2d28f9d
+++ monotone.texi 68434cc3c9a0051f28fe4cb0031c73456889586f
@@ -39,7 +39,7 @@
Copyright @copyright{} 2006 Alex Queiroz @*
Copyright @copyright{} 2006, 2007 William Uther @*
Copyright @copyright{} 2006 - 2010 Thomas Keller @*
-Copyright @copyright{} 2007 - 2010 Stephen Leake @*
+Copyright @copyright{} 2007 - 2011 Stephen Leake @*
This manual is made available under the GNU GPL version 2.0 or
greater. See the accompanying file COPYING for details.
@@ -4192,7 +4192,7 @@ @section Exporting to GIT
there are multiple author certs the git exporter arbitrarily choses
one of them. The full list of monotone certs may be exported in the
git commit message using the @option{--log-certs} option described in
address@hidden
address@hidden
Monotone author names often look like raw email addresses such as
@code{"user@@example.com"}. These are not considered valid by git
@@ -4210,7 +4210,7 @@ @section Exporting to GIT
the committer.
@item
both author and committer will be looked up in the file specified by
-the @option{--authors-file} option described in @ref{GIT} and
+the @option{--authors-file} option described in @ref{VCS} and
translated to the specified value if found.
@item
any author or committer value not found in the authors file will be
@@ -4224,7 +4224,7 @@ @section Exporting to GIT
Branch names used by monotone are allowed to contain characters that
are not considered valid by git. These may be mapped to other names
-using the @option{--branches-file} option described in @ref{GIT}
+using the @option{--branches-file} option described in @ref{VCS}
A monotone revision may have multiple @code{changelog} certs and
multiple @code{comment} certs. The git exporter deals with these by
@@ -4439,7 +4439,7 @@ @section Using packets
@page
address@hidden Bisecting, , Using packets, Advanced Uses
address@hidden Bisecting, , Using packets, Advanced Uses
@section Bisecting
Bisecting is an efficient means of finding the earliest revision that
@@ -4859,7 +4859,8 @@ @chapter Command Reference
@chapter Command Reference
Monotone has a large number of commands. To help navigate through them
-all, commands are grouped into logical categories.
+all, commands are grouped into logical categories. In addition, there
+are global options that apply to all commands.
Many command options come in pairs that affect the same value. For example,
@command{mtn log} takes a @var{brief} option; this can be reversed by
@@ -4880,37 +4881,162 @@ @chapter Command Reference
@menu
+* Global Options:: Options that affect all commands
* Tree:: Operations on tree states in your database
* Workspace:: Operations on your workspace
* Network:: Communication with the network
* Informative:: Production of descriptive reports
-* Key and Cert Trust:: Keys and Trust Evaluations based on them
-* Certificate:: Creation of certificates
+* Review:: Reviewing revisions
+* Variables:: Managing persistent variables
+* Key and Cert:: Keys, Certificates, and Trust Evaluations based on them
* Packet I/O:: Production or consumption of packets
* Database:: Manipulation of your database as a whole
* Automation:: Running monotone from other programs
-* RCS:: Importing legacy version control files
-* GIT:: Exporting a monotone repository to git
+* VCS:: Importing and exporting to other version control systems
@end menu
address@hidden the 'debug' commands don't have a section; you have to know what
address@hidden you are doing to use them, so it's not worth maintaining them in
address@hidden this manual.
address@hidden
address@hidden Global Options, Tree, Command Reference, Command Reference
address@hidden Global Options
address@hidden @command
address@hidden --confdir <arg>
+Set the location of the configuration directory (default
address@hidden/.monotone} on Unix and Cygwin, @file{%APPDATA%\monotone%} on
+Windows MinGW). This is where monotone finds:
address@hidden
address@hidden Tree, Workspace, Command Reference, Command Reference
address@hidden Tree
address@hidden
address@hidden keys, in @file{conf_dir/keys}; @ref{Certificates},
address@hidden Keys}. The location of the keys directory can be
+overridden separately with the @command{--keydir} option.
address@hidden @command
address@hidden mtn cat @var{path}
address@hidden mtn cat address@hidden @var{path}
address@hidden rcfiles, which are per-user configuration files containing Lua code
+(@ref{Lua Reference}) that are run each time monotone starts up.
-Write the contents of a specific file @var{path} to standard output.
address@hidden default database
+See option @command{--db} below.
-Without a @option{--revision} argument, the command outputs the
-contents of @var{path} as found in the current revision. This requires
-the command be executed from within a workspace.
address@hidden itemize
-With an explicit @option{--revision} argument, the command outputs
-contents of @var{path} at that revision.
+In addition, monotone writes a dump file to the configuration
+directory when it fails.
address@hidden --date-format <arg>
+strftime(3) format specification for printing dates. The default
+format is @code{%x} for dates, @code{%X} for times, @code{%x %X} for
+both. This can also be overridden by the @code{get_date_format_spec}
+hook; @ref{Hooks}.
+
address@hidden --db <arg>
+Set the database to use; defaults to the database specified in the
+current workspace (stored in @file{_MTN/options}; @ref{Storage and
+workflow}), or to nothing if not in a workspace.
+
+An argument of @code{:memory:} specifies a memory-only database; any
+changes are not saved to a file. @c what is this useful for?
+
address@hidden --dump <arg>
+File to dump debugging log to, on failure; default
address@hidden/dump} if not in a workspace, @file{_MTN/debug} if in a
+workspace.
+
address@hidden --help
+Display help information. This is the same as the @command{mtn help}
+command.
+
address@hidden --ignore-suspend-certs
address@hidden --no-ignore-suspend-certs
+Do not ignore revisions marked as suspended; see the @command{mtn
+suspend} command.
+
address@hidden --key <arg>
address@hidden --use-default-key
+Set the key for signatures, using either the key name or the key hash
+(@ref{Generating Keys}). If there is only one key in the keydir, then
+that is the default key. Otherwise there is no default key.
+
address@hidden --keydir <arg>
+Set the key directory (where the ``key store'' is located); default is
address@hidden/keys}.
+
address@hidden --log <arg>
+Specifiy a file to which the log (consisting of all debug,
+informational, and warning messages) is written; default is the
address@hidden process output.
+
address@hidden --no-builtin-rcfile
address@hidden --builtin-rcfile
+Do not load the built-in rcfile with the default hooks. This means
+all hooks will have null definitions (unless overridden by other
+rcfiles). @ref{Hooks}.
+
address@hidden --no-default-confdir
address@hidden --allow-default-confdir
+Don't use a default confdir; @command{--confdir} must be specified if
+a configuration file is needed.
+
address@hidden --no-format-dates
+Print date certs exactly as stored in the database.
+
address@hidden --no-standard-rcfiles
address@hidden --standard-rcfiles
+Do not load the standard rcfiles, which are
address@hidden/.monotone/monotonerc} on Unix or
address@hidden on Windows, and
address@hidden/monotonerc} in the current workspace.
+
address@hidden --no-workspace
address@hidden --allow-workspace
+Don't look for a workspace; this means options that normally get their
+default values from the workspace will not have those default values.
+
address@hidden --non-interactive
address@hidden --interactive
+Do not prompt the user for input; fail instead. For example, don't
+prompt for a key passphrase, or when doing a merge, do not start the
+external merger to resolve a conflict.
+
address@hidden --quiet
address@hidden --verbose
+Decrease or increase verbosity. There are four levels of verbosity;
+debug, information, warning, and none. The default is information.
+
address@hidden --rcfile <arg>
+Specify an extra rcfile to load.
+
address@hidden --clear-rcfiles
+Cancel all previous @command{rcfile} options (standard rcfiles are
+still loaded).
+
address@hidden --root <arg>
+Limit the search for a workspace to the specified root directory
+
address@hidden --ssh-sign <arg>
+Controls use of ssh-agent. Valid arguments are: 'yes' to use ssh-agent
+to make signatures if possible, 'no' to force use of monotone's
+internal code, 'only' to force use of ssh-agent, 'check' to sign with
+both and compare.
+
address@hidden --ticker <arg>
+Set ticker style; one of 'count', 'dot', or 'none'
+
address@hidden --timestamps
+Show timestamps in front of error, warning, and progress messages.
+
address@hidden --version
+Print version number, then exit; same as @command{mtn version}.
+
address@hidden --xargs <arg>
address@hidden -@@ <arg>
+Insert command line arguments taken from the given file.
address@hidden ftable
+
address@hidden Tree, Workspace, Global Options, Command Reference
address@hidden Tree
+
address@hidden @command
@item mtn checkout [--[no-]move-conflicting-paths] address@hidden @var{directory}
@itemx mtn co [--[no-]move-conflicting-paths] address@hidden @var{directory}
@itemx mtn [--[no-]move-conflicting-paths] address@hidden checkout @var{directory}
@@ -4958,43 +5084,9 @@ @section Tree
@emph{must} provide a @var{branchname}; monotone will attempt to infer
@var{id} as the unique head of @var{branchname} if it exists.
address@hidden mtn clone @var{uri} address@hidden address@hidden
address@hidden mtn clone @var{address}[:@var{port}] @var{branchname} address@hidden
address@hidden mtn conflicts
address@hidden
-The clone command is a helper command that performs the roles of a
-number of other commands all at once. Firstly, it constructs a new
-database. If no database is given, the configured default
-database is created or re-used (see the hook @code{get_default_database_alias}
-in the @ref{Lua Reference} for more details). Then it populates this database
-by @command{pull}ing any data which match the branch pattern in the @var{uri}
-or the given @var{branchname} argument from the remote database.
-Finally, it copies the files out of the newly created database into a
-local directory, just as @command{checkout} would. If no @var{directory}
-is given, the @var{branchname} is used as directory.
-
address@hidden notice:} The @var{address}[:@var{port}] @var{branchname}
-call syntax is deprecated and subject of removal in future versions of monotone!
-
address@hidden mtn disapprove address@hidden @var{child}
-
-This command records a disapproval of the changes between @var{parent}'s
-ancestor and @var{child}. If @var{parent} is omitted, only @var{child}
-is disapproved. The command does the disapproval by committing
-the @i{inverse} changes as a new revision descending from @var{child}.
-The new revision will show up as a new head and thus a subsequent
address@hidden will incorporate the inverse of the disapproved changes
-in the other head(s).
-
-Conceptually, @command{disapprove}s contract is that disapprove(A) gives a
-revision B such that whenever B is merged with a descendant D of A the merge
-will result in what D ``would have looked like'' if A had never happened.
-
-Note that as a consequence of this contract the @command{disapprove} command
-only works if all changesets from @var{parent} to @var{child} have exactly
-one ancestor, since it hasn't been worked out how to generate such
-a descendant in the multi-ancestor case.
-
-
@item mtn heads address@hidden
This command lists the ``heads'' of @var{branchname}.
@@ -5005,7 +5097,6 @@ @section Tree
not be the newest revisions, in terms of time, but synchronization of
computer clocks is not reliable, so monotone usually ignores time.
-
@item mtn merge address@hidden
This command merges the ``heads'' of @var{branchname}, if there are
multiple heads, and commits the results to the database, marking the
@@ -5094,6 +5185,30 @@ @section Tree
The twist with the @command{mtn setup} part is that it sets the parent
to be the given revision or the head of the given branch instead of the
null revision.
+
address@hidden mtn refresh_inodeprints
+This command puts the current workspace into @ref{Inodeprints} mode,
+if it was not already, and forces a full inodeprints cache refresh.
+After running this command, you are guaranteed that your workspace is
+in inodeprints mode, and that the inodeprints cache is accurate and up
+to date.
+
address@hidden mtn setup -b @var{branchname} [-d @var{database}] address@hidden
+This command prepares @var{directory} as a monotone workspace,
+by creating and populating the @file{_MTN} directory with basic
+information. This information must include at least the branch
+to be used. If no database is given, the configured default
+database is created or re-used (see the hook
address@hidden in the @ref{Lua Reference} for
+more details).
+Both settings, branch and database name, will be placed in the
address@hidden/options} file.
+
+This can be used with an empty directory to start a new blank project,
+or within an existing directory full of files, prior to using
address@hidden commit}. If no directory is specified, the current
+directory is used.
+
@end ftable
@page
@@ -5244,22 +5359,6 @@ @section Workspace
@section Workspace
@ftable @command
address@hidden mtn setup -b @var{branchname} [-d @var{database}] address@hidden
-This command prepares @var{directory} as a monotone workspace,
-by creating and populating the @file{_MTN} directory with basic
-information. This information must include at least the branch
-to be used. If no database is given, the configured default
-database is created or re-used (see the hook
address@hidden in the @ref{Lua Reference} for
-more details).
-Both settings, branch and database name, will be placed in the
address@hidden/options} file.
-
-This can be used with an empty directory to start a new blank project,
-or within an existing directory full of files, prior to using
address@hidden commit}. If no directory is specified, the current
-directory is used.
-
@item mtn add [--[no-]recursive | -R] [--[no-]respect-ignore] @var{pathname...}
@item mtn add [--[no-]recursive | -R] [--[no-]respect-ignore] --[no-]unknown address@hidden
This command places ``add'' entries for the paths specified in
@@ -5284,14 +5383,15 @@ @section Workspace
directory non-recursively, monotone will warn if the directory has
any files that would be added by a recursive add.
address@hidden mtn [--[no-]respect-ignore] mkdir @var{directory...}
address@hidden 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
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?
address@hidden mtn [--bookkeep-only] drop @var{pathname...}
address@hidden mtn drop [--bookkeep-only] @var{pathname...}
@itemx mtn drop --missing
This command places ``drop'' entries for the paths specified in
@var{pathname...} in the workspace's ``work list'' and deletes
@@ -5322,10 +5422,10 @@ @section Workspace
file was deleted from the workspace, this reverts it. If it was not
deleted (because it was changed), it just removes the pending drop.
address@hidden mtn [--bookkeep-only] rename @var{src} @var{dst}
address@hidden mtn [--bookkeep-only] mv @var{src} @var{dst}
address@hidden mtn [--bookkeep-only] rename @var{src1} @var{...} @var{dst/}
address@hidden mtn [--bookkeep-only] mv @var{src1} @var{...} @var{dst/}
address@hidden mtn rename [--bookkeep-only] @var{src} @var{dst}
address@hidden mtn mv [--bookkeep-only] @var{src} @var{dst}
address@hidden mtn rename [--bookkeep-only] @var{src1} @var{...} @var{dst/}
address@hidden mtn mv [--bookkeep-only] @var{src1} @var{...} @var{dst/}
This command places ``rename'' entries for the paths specified in
@var{src} and @var{dst} in the workspace's ``work list''. The second form
renames a number of source paths to the given destination. The work
@@ -5524,7 +5624,6 @@ @section Workspace
instructions should be removed. Any pending text in @file{MTN/log}
will be left untouched if the commit is cancelled.
-
@item mtn revert @var{pathname...}
@itemx mtn revert --missing @var{pathname...}
This command changes your workspace, so that changes you have made
@@ -5619,13 +5718,6 @@ @section Workspace
When running @command{pluck}, it is sometimes possible for
@ref{Workspace Collisions} to occur.
address@hidden mtn refresh_inodeprints
-This command puts the current workspace into @ref{Inodeprints} mode,
-if it was not already, and forces a full inodeprints cache refresh.
-After running this command, you are guaranteed that your workspace is
-in inodeprints mode, and that the inodeprints cache is accurate and up
-to date.
-
@item mtn pivot_root [--bookkeep-only] [--[no-]move-conflicting-paths] pivot_root @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
@@ -5659,62 +5751,6 @@ @section Workspace
When running @command{pivot_root}, it is sometimes possible for
@ref{Workspace Collisions} to occur.
address@hidden mtn bisect good address@hidden ...] [--[no-]move-conflicting-paths]
-Mark the specified revisions as ``good'' for the current bisection
-operation. If no bisection operation is in progress a new bisection is
-initialized. If a bisection operation is in progress the next update
-target is selected and the workspace is updated to the selected
-revision.
-
-If the update is blocked by conflicting unversioned paths existing in
-the workspace this command may be re-issued with the
address@hidden option. Alternatively, the
address@hidden update} command can be used with this option to update
-the workspace and move the conflicting paths out of the way.
-
address@hidden mtn bisect bad address@hidden ...] [--[no-]move-conflicting-paths]
-Mark the specified revisions as ``bad'' for the current bisection
-operation. If no bisection operation is in progress a new bisection is
-initialized. If a bisection operation is in progress the next update
-target is selected and the workspace is updated to the selected
-revision.
-
-If the update is blocked by conflicting unversioned paths existing in
-the workspace this command may be re-issued with the
address@hidden option. Alternatively, the
address@hidden update} command can be used with this option to update
-the workspace and move the conflicting paths out of the way.
-
address@hidden mtn bisect skip address@hidden ...] [--[no-]move-conflicting-paths]
-Mark the specified revisions as ``skipped'' for the current bisection
-operation. If no bisection operation is in progress a new bisection is
-initialized. If a bisection operation is in progress the next update
-target is selected and the workspace is updated to the selected
-revision.
-
-If the update is blocked by conflicting unversioned paths existing in
-the workspace this command may be re-issued with the
address@hidden option. Alternatively, the
address@hidden update} command can be used with this option to update
-the workspace and move the conflicting paths out of the way.
-
address@hidden mtn bisect update [--[no-]move-conflicting-paths]
-Update the workspace to the next revision selected by the previous
-bisect operation. This command can be useful when the previous bisect
-operation fails to update the workspace because of conflicting
-unversioned paths existing in the workspace.
-
address@hidden mtn bisect status
-Report the status of the current bisection operation including the
-number of revisions that remain to be tested, the number of revisions
-that have been tested and the next revision that will selected for
-testing.
-
address@hidden mtn bisect reset
-Reset the current bisection operation by updating the workspace back
-to the revision from which the bisection was started and clearing the
-current bisection information.
-
@end ftable
@page
@@ -5869,15 +5905,98 @@ @section Network
in case someone, for some odd reason, decides to put a ``*'' into their
branch name.
address@hidden ftable
address@hidden mtn clone @var{uri} address@hidden address@hidden
address@hidden mtn clone @var{address}[:@var{port}] @var{branchname} address@hidden
+The clone command is a helper command that performs the roles of a
+number of other commands all at once. Firstly, it constructs a new
+database. If no database is given, the configured default
+database is created or re-used (see the hook @code{get_default_database_alias}
+in the @ref{Lua Reference} for more details). Then it populates this database
+by @command{pull}ing any data which match the branch pattern in the @var{uri}
+or the given @var{branchname} argument from the remote database.
+Finally, it copies the files out of the newly created database into a
+local directory, just as @command{checkout} would. If no @var{directory}
+is given, the @var{branchname} is used as directory.
address@hidden notice:} The @var{address}[:@var{port}] @var{branchname}
+call syntax is deprecated and subject of removal in future versions of monotone!
address@hidden ftable
+
@page
address@hidden Informative, Key and Cert Trust, Network, Command Reference
address@hidden Informative, Review, Network, Command Reference
@section Informative
@ftable @command
address@hidden mtn bisect good address@hidden ...] [--[no-]move-conflicting-paths]
+Mark the specified revisions as ``good'' for the current bisection
+operation. If no bisection operation is in progress a new bisection is
+initialized. If a bisection operation is in progress the next update
+target is selected and the workspace is updated to the selected
+revision.
+
+If the update is blocked by conflicting unversioned paths existing in
+the workspace this command may be re-issued with the
address@hidden option. Alternatively, the
address@hidden update} command can be used with this option to update
+the workspace and move the conflicting paths out of the way.
+
address@hidden mtn bisect bad address@hidden ...] [--[no-]move-conflicting-paths]
+Mark the specified revisions as ``bad'' for the current bisection
+operation. If no bisection operation is in progress a new bisection is
+initialized. If a bisection operation is in progress the next update
+target is selected and the workspace is updated to the selected
+revision.
+
+If the update is blocked by conflicting unversioned paths existing in
+the workspace this command may be re-issued with the
address@hidden option. Alternatively, the
address@hidden update} command can be used with this option to update
+the workspace and move the conflicting paths out of the way.
+
address@hidden mtn bisect skip address@hidden ...] [--[no-]move-conflicting-paths]
+Mark the specified revisions as ``skipped'' for the current bisection
+operation. If no bisection operation is in progress a new bisection is
+initialized. If a bisection operation is in progress the next update
+target is selected and the workspace is updated to the selected
+revision.
+
+If the update is blocked by conflicting unversioned paths existing in
+the workspace this command may be re-issued with the
address@hidden option. Alternatively, the
address@hidden update} command can be used with this option to update
+the workspace and move the conflicting paths out of the way.
+
address@hidden mtn bisect update [--[no-]move-conflicting-paths]
+Update the workspace to the next revision selected by the previous
+bisect operation. This command can be useful when the previous bisect
+operation fails to update the workspace because of conflicting
+unversioned paths existing in the workspace.
+
address@hidden mtn bisect status
+Report the status of the current bisection operation including the
+number of revisions that remain to be tested, the number of revisions
+that have been tested and the next revision that will selected for
+testing.
+
address@hidden mtn bisect reset
+Reset the current bisection operation by updating the workspace back
+to the revision from which the bisection was started and clearing the
+current bisection information.
+
address@hidden mtn cat @var{path}
address@hidden mtn cat address@hidden @var{path}
+
+Write the contents of a specific file @var{path} to standard output.
+
+Without a @option{--revision} argument, the command outputs the
+contents of @var{path} as found in the current revision. This requires
+the command be executed from within a workspace.
+
+With an explicit @option{--revision} argument, the command outputs
+contents of @var{path} at that revision.
+
@item mtn status
@itemx mtn status @var{pathname...}
@@ -6039,12 +6158,14 @@ @section Informative
@itemx mtn diff address@hidden @var{pathname...}
@itemx mtn diff address@hidden address@hidden
@itemx mtn diff address@hidden address@hidden @var{pathname...}
-
address@hidden mtn di
These commands print out GNU ``unified diff format'' textual difference
listings between various manifest versions. With no @option{--revision}
options, @command{diff} will print the difference from the
base revision to the current revision in the workspace.
address@hidden is an alias for @command{diff}.
+
With one @option{--revision} option, @command{diff} will print the
difference from the revision @var{id} to the current revision in the
workspace. If @option{--reverse} is given, the order of the diff is
@@ -6325,10 +6446,110 @@ @section Informative
commands and options, which is deactivated by default.
@end ftable
address@hidden Review, Variables, Informative, Command Reference
address@hidden Review
address@hidden @command
address@hidden mtn approve @var{id}
+
+This command is a synonym for @command{mtn cert @var{id} branch
address@hidden where @var{branchname} is the current branch name
+(either deduced from the workspace or from the @option{--branch}
+option).
+
address@hidden mtn comment @var{id}
address@hidden mtn comment @var{id} @var{comment}
+
+These commands are synonyms for @command{mtn cert @var{id}
+comment @var{comment}}. If @var{comment} is not provided, it is read
+from @code{stdin}.
+
address@hidden mtn disapprove address@hidden @var{child}
+
+This command records a disapproval of the changes between @var{parent}'s
+ancestor and @var{child}. If @var{parent} is omitted, only @var{child}
+is disapproved. The command does the disapproval by committing
+the @i{inverse} changes as a new revision descending from @var{child}.
+The new revision will show up as a new head and thus a subsequent
address@hidden will incorporate the inverse of the disapproved changes
+in the other head(s).
+
+Conceptually, @command{disapprove}s contract is that disapprove(A) gives a
+revision B such that whenever B is merged with a descendant D of A the merge
+will result in what D ``would have looked like'' if A had never happened.
+
+Note that as a consequence of this contract the @command{disapprove} command
+only works if all changesets from @var{parent} to @var{child} have exactly
+one ancestor, since it hasn't been worked out how to generate such
+a descendant in the multi-ancestor case.
+
address@hidden mtn suspend @var{id}
+
+This command is a synonym for @command{mtn cert @var{id} suspend
address@hidden where @var{branchname} is the current branch name
+(either deduced from the workspace or from the @option{--branch}
+option).
+
address@hidden mtn tag @var{id} @var{tagname}
+
+This command associates the symbolic name @var{tagname} with the
+revision @var{id}, so that symbolic name can later be used in
address@hidden for specifying revisions for commands like
address@hidden or @command{diff}.
+
+This command is a synonym for @command{mtn cert @var{id} tag
address@hidden
+
address@hidden mtn testresult @var{id} 0
address@hidden mtn testresult @var{id} 1
+
+These commands are synonyms for @command{mtn cert @var{id}
+testresult 0} or @command{mtn cert @var{id} testresult 1}.
+
address@hidden ftable
+
address@hidden Variables, Key and Cert, Review, Command Reference
address@hidden Variables
address@hidden @command
address@hidden mtn cleanup_workspace_list
+
+Removes all invalid workspaces from the list of registered workspaces
+of the current database. A workspace is considered invalid if its path
+does either not contain an _MTN directory anymore or if the configured
+database for this workspace is a different one.
+
address@hidden mtn register_workspace address@hidden
+
+Registers the given workspace from the current database, so that it
+will show up in the output of @command{list databases} (the database
+has to be in a managed location for this to work).
+
+If no @var{workspace_path} is given, this command defaults to the
+current workspace.
+
address@hidden mtn set @var{domain} @var{name} @var{value}
+
+Associates the value @var{value} to @var{name} in domain @var{domain}.
+See @ref{Vars} for more information.
+
address@hidden mtn unregister_workspace address@hidden
+
+Unregisters the given workspace from the current database, so that it
+will no longer show up in the output of @command{list databases}.
+
+If no @var{workspace_path} is given, this command defaults to the
+current workspace.
+
address@hidden mtn unset @var{domain} @var{name}
+
+Deletes any value associated with @var{name} in @var{domain}. See
address@hidden for more information.
+
address@hidden ftable
+
@page
address@hidden Key and Cert Trust, Certificate, Informative, Command Reference
address@hidden Key and Cert Trust
address@hidden Key and Cert, Packet I/O, Variables, Command Reference
address@hidden Key and Cert
@ftable @command
@item mtn genkey @var{keyid}
@@ -6451,16 +6672,6 @@ @section Key and Cert Trust
will be removed at some future time as it is meant only for testing and will not
work with all signing algorithms.
-
address@hidden ftable
-
-
-
address@hidden
address@hidden Certificate, Packet I/O, Key and Cert Trust, Command Reference
address@hidden Certificate
-
address@hidden @command
@item mtn cert @var{selector} @var{certname}
@itemx mtn cert @var{selector} @var{certname} @var{certval}
@@ -6471,50 +6682,10 @@ @section Certificate
If @var{certval} is provided, it is the value of the certificate.
Otherwise the certificate value is read from @code{stdin}.
address@hidden mtn approve @var{id}
-
-This command is a synonym for @command{mtn cert @var{id} branch
address@hidden where @var{branchname} is the current branch name
-(either deduced from the workspace or from the @option{--branch}
-option).
-
-
address@hidden mtn comment @var{id}
address@hidden mtn comment @var{id} @var{comment}
-
-These commands are synonyms for @command{mtn cert @var{id}
-comment @var{comment}}. If @var{comment} is not provided, it is read
-from @code{stdin}.
-
address@hidden mtn suspend @var{id}
-
-This command is a synonym for @command{mtn cert @var{id} suspend
address@hidden where @var{branchname} is the current branch name
-(either deduced from the workspace or from the @option{--branch}
-option).
-
address@hidden mtn tag @var{id} @var{tagname}
-
-This command associates the symbolic name @var{tagname} with the
-revision @var{id}, so that symbolic name can later be used in
address@hidden for specifying revisions for commands like
address@hidden or @command{diff}.
-
-This command is a synonym for @command{mtn cert @var{id} tag
address@hidden
-
address@hidden mtn testresult @var{id} 0
address@hidden mtn testresult @var{id} 1
-
-These commands are synonyms for @command{mtn cert @var{id}
-testresult 0} or @command{mtn cert @var{id} testresult 1}.
-
@end ftable
-
-
@page
address@hidden Packet I/O, Database, Certificate, Command Reference
address@hidden Packet I/O, Database, Key and Cert, Command Reference
@section Packet I/O
Monotone can produce and consume data in a convenient, portable form
@@ -6563,7 +6734,6 @@ @section Packet I/O
the @sc{rsa} key @var{keyid}. These can be used to transport public or
private keys safely between monotone databases.
-
@item mtn read
@item mtn read @var{file1} @var{file2...}
@@ -6572,46 +6742,11 @@ @section Packet I/O
@end ftable
-
@page
@node Database, Automation, Packet I/O, Command Reference
@section Database
@ftable @command
address@hidden mtn set @var{domain} @var{name} @var{value}
-
-Associates the value @var{value} to @var{name} in domain @var{domain}.
-See @ref{Vars} for more information.
-
address@hidden mtn unset @var{domain} @var{name}
-
-Deletes any value associated with @var{name} in @var{domain}. See
address@hidden for more information.
-
address@hidden mtn register_workspace address@hidden
-
-Registers the given workspace from the current database, so that it
-will show up in the output of @command{list databases} (the database
-has to be in a managed location for this to work).
-
-If no @var{workspace_path} is given, this command defaults to the
-current workspace.
-
address@hidden mtn unregister_workspace address@hidden
-
-Unregisters the given workspace from the current database, so that it
-will no longer show up in the output of @command{list databases}.
-
-If no @var{workspace_path} is given, this command defaults to the
-current workspace.
-
address@hidden mtn cleanup_workspace_list
-
-Removes all invalid workspaces from the list of registered workspaces
-of the current database. A workspace is considered invalid if its path
-does either not contain an _MTN directory anymore or if the configured
-database for this workspace is a different one.
-
@item mtn db init address@hidden
This command initializes a new monotone database at @var{dbfile}.
@@ -6858,7 +6993,7 @@ @section Database
@page
address@hidden Automation, RCS, Database, Command Reference
address@hidden Automation, VCS, Database, Command Reference
@section Automation
This section contains subcommands of the @command{mtn automate} command,
@@ -6866,11 +7001,9 @@ @section Automation
also give useful chatter on @code{stderr}, including warnings and error
messages.
-Many commands produce output in a format called basic_io, for more
+Many commands produce output in a format called basic_io; for more
information, @pxref{Formats}.
address@hidden Automation Commands
-
@ftable @command
@item mtn automate interface_version
@@ -10898,18 +11031,10 @@ @subsection Automation Commands
@end ftable
@page
address@hidden RCS, GIT, Automation, Command Reference
address@hidden RCS
address@hidden VCS, , Automation, Command Reference
address@hidden VCS
@ftable @command
address@hidden mtn rcs_import @var{filename...}
-
-This command imports all the file versions in each RCS file listed in
address@hidden These files should be raw RCS files, ending in
address@hidden,v}. Monotone parses them directly and inserts them into your
-database. Note that this does not do any revision reconstruction, and
-is only useful for debugging.
-
@item mtn cvs_import @var{pathname}
This command imports all the file versions in each RCS file found in the
@@ -10925,14 +11050,6 @@ @section RCS
directory you point it at will become the root of monotone's version of
the tree.
address@hidden ftable
-
-
address@hidden
address@hidden GIT, , RCS, Command Reference
address@hidden GIT
-
address@hidden @command
@item mtn git_export address@hidden address@hidden
@itemx mtn git_export address@hidden address@hidden
@itemx mtn git_export [--log-revids] [--log-certs] [--use-one-changelog]
@@ -11054,7 +11171,6 @@ @section GIT
@end ftable
-
@node Formats, Lua Reference, Command Reference, Top
@chapter Formats
@@ -12543,7 +12659,7 @@ @section Additional Lua Functions
@page
address@hidden Implementation Differences, ,Additional Lua Functions, Lua Reference
address@hidden Implementation Differences, , Additional Lua Functions, Lua Reference
@section Implementation Differences
This section documents disabled and overwritten functions from the standard
============================================================
--- monotone.texi d4c3b0f9d5e1df4d3424893864bc7e76a50a04a7
+++ monotone.texi 68434cc3c9a0051f28fe4cb0031c73456889586f
@@ -5881,6 +5881,12 @@ @section Network
option when connecting to the server and branch pattern that you want to
make the new default.
+The @command{serve} command doesn't care about workspaces, so even if
+you stand in one, you will have to give it the database to server, the
+server key to use and the key directory explicitely, or otherwise, it
+will take the defaults it would use when you don't stand in a
+workspace.
+
In the server, different permissions can be applied to each branch; see
the hooks @code{get_netsync_read_permitted} and
@code{get_netsync_write_permitted} (see @ref{Lua Reference}).
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone: af8102fc597d7fc268dff8dbf95e70e6d9a884c5,
code <=