# # # patch "monotone.texi" # from [e72de3b86c39456a3df449afc106b1879578d191] # to [ae9b76f0dc7ae3b1b577f909e1f10b4a007da542] # ============================================================ --- monotone.texi e72de3b86c39456a3df449afc106b1879578d191 +++ monotone.texi ae9b76f0dc7ae3b1b577f909e1f10b4a007da542 @@ -6716,13 +6716,16 @@ @section Automation Each attribute stanza also contains another entry which tells the status of attribute. This entry can have one of the following four values: address@hidden address@hidden 'added': the attribute has just been added to the file - address@hidden 'dropped': the attribute has just been dropped from the file - address@hidden 'unchanged': the attribute has not been changed since the last revision - address@hidden 'changed': the attribute has been changed since the last revision address@hidden itemize The status 'changed' can come up if an attribute foo has been dropped and added afterwards with another value, like @@ -6761,16 +6764,23 @@ @section Automation @item Arguments: One or more @var{file} arguments restrict the diff output to these files, -otherwise all changed files in the current workspace are considered. Furthermore -zero, one or two revisions can be given as last arguments, where for +otherwise all changed files in the given revision(s) and/or current workspace +are considered. - no revision: the diff is done between the workspace revision and the - parent (base) revision of this workspace, - one revision: the diff is done between the workspace revision and the - given revision @var{rev1}, - two revisions: the diff is done between @var{rev1} and @var{rev2}; no - workspace is needed in this case. +Furthermore zero, one or two revisions can be given as last arguments, where for address@hidden address@hidden +no revision: the diff is done between the workspace revision and the +parent (base) revision of this workspace address@hidden +one revision: the diff is done between the workspace revision and the +given revision @var{rev1}, address@hidden +two revisions: the diff is done between @var{rev1} and @var{rev2}; no +workspace is needed in this case. address@hidden itemize + @item Added in: 3.2 @@ -6807,8 +6817,8 @@ @section Automation If an incorrect number of revisions are given or a workspace is required, but not found, prints to stderr and exits with status 1. If a certain given revision -does not exist, it is interpreted as file path. If one or more file restrictions -can't be applied, the command prints to stderr as well and exits. +does not exist, it is interpreted as file restriction. If one or more file +restrictions can't be applied, the command prints to stderr and exits, too. @end table