[svn-r19543] Description:

	Bring r19411:19542 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode

1 files changed, 24 insertions, 0 deletions

diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index 6141495..e348caa 100644
--- a/tools/h5diff/testfiles/h5diff_612.txt
+++ b/tools/h5diff/testfiles/h5diff_612.txt
@@ -63,6 +63,30 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            comparing floating point values.
                            By default, strict equality is used. Use -p or -d to
                            set specific tolerance.
+   --exclude-path "path"   Exclude the specified path to an object when
+                           comparing files or groups. If a group is excluded,
+                           all member objects will also be excluded.
+                           The specified path is excluded wherever it occurs.
+                           This flexibility enables the same option to exclude
+                           either objects that exist only in one file or
+                           common objects that are known to differ.
+
+                           When comparing files, "path" is the absolute path to
+                           the excluded object; when comparing groups, "path" is
+                           similar to the relative path from the group to the
+                           excluded object. This "path" can be taken from the
+                           first section of the output of the --verbose option.
+                           For example, if you are comparing the group /groupA
+                           in two files and you want to exclude
+                           /groupA/groupB/groupC in both files, the exclude
+                           option would read as follows:
+                             --exclude-path "/groupB/groupC"
+
+                           If there are multiple paths to an object, only the
+                           specified path(s) will be excluded; the comparison
+                           will include any path not explicitly excluded.
+                           This option can be used repeatedly to exclude
+                           multiple paths.
 
  Modes of output:
   Default mode: print the number of differences found and where they occured