浏览代码

mention borg delete borg

this makes it clear how to start from scratch, in case the chunk cache
was failed to be copied and so on.
Antoine Beaupré 9 年之前
父节点
当前提交
fded2219a8
共有 1 个文件被更改,包括 11 次插入4 次删除
  1. 11 4
      borg/archiver.py

+ 11 - 4
borg/archiver.py

@@ -931,10 +931,6 @@ Type "Yes I am sure" if you understand this and want to continue.\n""")
         the first backup after the conversion takes longer than expected
         the first backup after the conversion takes longer than expected
         due to the cache resync.
         due to the cache resync.
 
 
-        the conversion can PERMANENTLY DAMAGE YOUR REPOSITORY! Attic
-        will also NOT BE ABLE TO READ THE BORG REPOSITORY ANYMORE, as
-        the magic strings will have changed.
-
         it is recommended you run this on a copy of the Attic
         it is recommended you run this on a copy of the Attic
         repository, in case something goes wrong, for example:
         repository, in case something goes wrong, for example:
 
 
@@ -942,6 +938,17 @@ Type "Yes I am sure" if you understand this and want to continue.\n""")
             borg upgrade -n borg
             borg upgrade -n borg
             borg upgrade borg
             borg upgrade borg
 
 
+        upgrade should be able to resume if interrupted, although it
+        will still iterate over all segments. if you want to start
+        from scratch, use `borg delete` over the copied repository to
+        make sure the cache files are also removed:
+
+            borg delete borg
+
+        the conversion can PERMANENTLY DAMAGE YOUR REPOSITORY! Attic
+        will also NOT BE ABLE TO READ THE BORG REPOSITORY ANYMORE, as
+        the magic strings will have changed.
+
         you have been warned.""")
         you have been warned.""")
         subparser = subparsers.add_parser('upgrade', parents=[common_parser],
         subparser = subparsers.add_parser('upgrade', parents=[common_parser],
                                           description=self.do_upgrade.__doc__,
                                           description=self.do_upgrade.__doc__,