Combine can now ignore errors.

2 files changed, 19 insertions, 0 deletions

diff --git a/doc/cmd.rst b/doc/cmd.rst
index d6de9f50..e9695ef8 100644
--- a/doc/cmd.rst
+++ b/doc/cmd.rst
@@ -221,6 +221,11 @@ systems, coverage.py won't know how to combine the data.  You can tell
 coverage.py how the different locations correlate with a ``[paths]`` section in
 your configuration file.  See :ref:`config_paths` for details.
 
+Some techniques for collecting data can result in corrupt data files.  If you
+have this problem, you can use the ``--ignore-errors`` option to turn those
+errors into warnings instead.
+
+
 .. _cmd_reporting:
 
 Reporting
diff --git a/doc/config.rst b/doc/config.rst
index 1b451b30..840e7de7 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -148,6 +148,20 @@ measure during execution.  See :ref:`source` for details.
 Try this if you get seemingly impossible results.
 
 
+.. _config_combine:
+
+[combine]
+---------
+
+Options for the ``coverage combine`` command.
+
+``ignore_errors`` (boolean, default False): ignore errors when reading the data
+files, so that corrupt data files won't prevent the other good ones from being
+combined.
+
+.. versionadded:: 4.1
+
+
 .. _config_paths:
 
 [paths]