#
#
# patch "monotone.texi"
#  from [4c9f3294e384f87ef6293e6be88ce100c39099fd]
#    to [736885d90d3c3b2f66b595e2bd64da8117a7a621]
# 
# patch "tests/automate_inventory/__driver__.lua"
#  from [b1913ba9ea62a9dde2a22ff8328792a4c0aafad2]
#    to [e12ed1600e4dc846891575fd758971461ff8512f]
#
============================================================
--- monotone.texi	4c9f3294e384f87ef6293e6be88ce100c39099fd
+++ monotone.texi	736885d90d3c3b2f66b595e2bd64da8117a7a621
@@ -6341,8 +6341,8 @@ @section Automation
 @table @strong
 @item Arguments:
 
-One or more file paths (optional). If present, only show inventory for the given
-files or directories (and their sub-directories).
+One or more file paths (optional). If present, only show an inventory for the
+given files or directories (and their sub-directories).
 
 @table @option
 @item address@hidden
@@ -6360,13 +6360,18 @@ @section Automation
 @item --no-unchanged
 Don't output files that are known but not changed in any way.
 
address@hidden --no-corresponding-renames
+If restricted to a renamed path, do not output the corresponding old / new
+paths for this restriction.
+
 @end table
 
 @item Changes:
 
 @itemize
 @item
-7.0 -- added options '--no-ignored', '--no-unknown', '--no-unchanged'
+7.0 -- added options '--no-ignored', '--no-unknown', '--no-unchanged' and
+'--no-corresponding-renames'
 @item
 6.0 -- converted to basic_io format (restriction support, various fixes)
 @item
@@ -6389,6 +6394,13 @@ @section Automation
   status "added" "known"
  changes "content"
 
+    path "attributes_altered"
+old_type "file"
+new_type "file"
+ fs_type "file"
+  status "known"
+ changes "attrs"
+
     path "dropped"
 old_type "file"
  fs_type "none"
@@ -6417,6 +6429,13 @@ @section Automation
   status "known"
  changes "content"
 
+    path "patched_and_attributes_altered"
+old_type "file"
+new_type "file"
+ fs_type "file"
+  status "known"
+ changes "content" "attrs"
+
     path "renamed"
 new_type "file"
 old_path "original"
@@ -6618,6 +6637,88 @@ @section Automation
  changes "content"
 @end verbatim
 
+Renamed and restricted to @file{original} or @file{renamed}:
address@hidden
+    path "original"
+old_type "file"
+new_path "renamed"
+ fs_type "none"
+  status "rename_source"
+
+    path "renamed"
+new_type "file"
+old_path "original"
+ fs_type "file"
+  status "rename_target" "known"
+ changes "content"
address@hidden verbatim
+
+Renamed and restricted to @file{original} with the @option{--no-corresponding-renames} option:
address@hidden
+    path "original"
+old_type "file"
+new_path "renamed"
+ fs_type "none"
+  status "rename_source"
address@hidden verbatim
+
+Renamed and restricted to @file{renamed} with the @option{--no-corresponding-renames} option:
address@hidden
+    path "renamed"
+new_type "file"
+old_path "original"
+ fs_type "file"
+  status "rename_target" "known"
+ changes "content"
address@hidden verbatim
+
+File is missing, an unversioned directory is in the way:
address@hidden
+    path "missing_file"
+old_type "file"
+new_type "file"
+ fs_type "directory"
+  status "invalid"
+ changes "content"
address@hidden verbatim
+
+Directory is missing, an unversioned file is in the way:
address@hidden
+    path "missing_directory"
+old_type "directory"
+new_type "directory"
+ fs_type "file"
+  status "invalid"
address@hidden verbatim
+
+Directory @file{source} renamed to @file{target}, @file{target} is missing, an
+unversioned file is in the way:
address@hidden
+    path "source"
+old_type "directory"
+new_path "target"
+ fs_type "none"
+  status "rename_source"
+
+    path "source/a"
+old_type "file"
+new_path "target/a"
+ fs_type "none"
+  status "rename_source"
+
+    path "target"
+new_type "directory"
+old_path "source"
+ fs_type "file"
+  status "rename_target" "invalid"
+
+    path "target/a"
+new_type "file"
+old_path "source/a"
+ fs_type "none"
+  status "rename_target" "missing"
address@hidden verbatim
+
 @item Output format:
 
 Each path is printed in one basic_io stanza. Stanzas are separated by
@@ -6687,7 +6788,6 @@ @section Automation
 @item invalid
 the file exists in the workspace and revision manifest, but with
 different types (one is a directory, the other a file).
address@hidden FIXME: not shown in examples or tests
 @end table
 
 @item changes
============================================================
--- tests/automate_inventory/__driver__.lua	b1913ba9ea62a9dde2a22ff8328792a4c0aafad2
+++ tests/automate_inventory/__driver__.lua	e12ed1600e4dc846891575fd758971461ff8512f
@@ -546,14 +546,14 @@ new_type = "file",
   status = {"known"},
  changes = {"attrs"}})
 
--- FIXME: Check if changes "content" is properly applied in several states
--- (there is at least one known wrong state where it is applied: when a
--- rename_target item is missing...)
-
 -- FIXME: tests for renaming directories
 -- also test that iff foo/ is renamed to bar/, any previous foo/node is
 -- now listed as bar/node
 
 -- FIXME: add test for 'pivot_root'
 
+-- FIXME: add test for the 'invalid' state:
+-- a) missing file, unversioned directory in the way
+-- b) missing directory, unversioned file is in the way
+
 -- end of file