From e64d91b73512dedf09ef62e09230ab79586d5b0d Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Fri, 18 Mar 2016 13:30:39 +0100 Subject: [PATCH] Update borg diff help message regarding --same-chunker-params --- borg/archiver.py | 9 ++++++--- docs/usage/diff.rst.inc | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/borg/archiver.py b/borg/archiver.py index c55ca5959..ffb71f20b 100644 --- a/borg/archiver.py +++ b/borg/archiver.py @@ -1213,9 +1213,12 @@ def build_parser(self, args=None, prog=None): be specified for ARCHIVE1. For archives created with Borg 1.1 or newer only chunks IDs - are compared, which is very fast. For archives prior to Borg 1.1 chunk contents must be - compared, unless you are sure they were created with the same chunker params - (pass --same-chunker-params). Note that the chunker params changed from Borg 0.xx to 1.0. + are compared, which is very fast. + + For archives prior to Borg 1.1 chunk contents are compared by default. + If you did not create the archives with different chunker params, + pass --same-chunker-params. + Note that the chunker params changed from Borg 0.xx to 1.0. See the output of the "borg help patterns" command for more help on exclude patterns. """) diff --git a/docs/usage/diff.rst.inc b/docs/usage/diff.rst.inc index 546746ef2..47a8676fa 100644 --- a/docs/usage/diff.rst.inc +++ b/docs/usage/diff.rst.inc @@ -49,8 +49,11 @@ Both archives need to be in the same repository, and a repository location may o be specified for ARCHIVE1. For archives created with Borg 1.1 or newer only chunks IDs -are compared, which is very fast. For archives prior to Borg 1.1 chunk contents must be -compared, unless you are sure they were created with the same chunker params -(pass --same-chunker-params). Note that the chunker params changed from Borg 0.xx to 1.0. +are compared, which is very fast. + +For archives prior to Borg 1.1 chunk contents are compared by default. +If you did not create the archives with different chunker params, +pass --same-chunker-params. +Note that the chunker params changed from Borg 0.xx to 1.0. See the output of the "borg help patterns" command for more help on exclude patterns.