# # # patch "monotone.texi" # from [5790199cf92c6d31f3de1a901c78a457e6399e71] # to [e72de3b86c39456a3df449afc106b1879578d191] # ============================================================ --- monotone.texi 5790199cf92c6d31f3de1a901c78a457e6399e71 +++ monotone.texi e72de3b86c39456a3df449afc106b1879578d191 @@ -6728,8 +6728,7 @@ @section Automation added afterwards with another value, like @verbatim -# foo has the value "bar" -$ mtn attr drop foo ; mtn attr set foo baz +$ mtn attr drop file.txt foo ; mtn attr set file.txt foo baz @end verbatim If an attribute has been dropped, the output will still return the previously @@ -6756,6 +6755,63 @@ @section Automation @end table address@hidden mtn automate content_diff address@hidden [...] address@hidden address@hidden + address@hidden @strong address@hidden 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 + + 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. + address@hidden Added in: + +3.2 + address@hidden Purpose: + +Prints the content changes between two revisions or a revision and the current +workspace. This command differs from @command{mtn diff} in that way that it only +outputs content changes and keeps quite on renames or drops, as the header of address@hidden diff} is omitted (this is what @command{mtn automate get_revision} +already provides). + address@hidden Sample output: + address@hidden +============================================================ +--- guitone/res/i18n/guitone_de.ts 9857927823e1d6a0339b531c120dcaadd22d25e9 ++++ guitone/res/i18n/guitone_de.ts 0b4715dc296b1955b0707923d45d79ca7769dd3f +@@ -1,6 +1,14 @@ + + + ++ AncestryGraph ++ +[...] address@hidden verbatim + address@hidden Output format: + +The GNU unified diff format. If there have been no content changes, the output +is empty. + address@hidden Error conditions: + +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. + address@hidden table + @item mtn automate get_file @var{id} @table @strong