From 4eba7d38ea7179402acae9a56320d49fc7c8d220 Mon Sep 17 00:00:00 2001 From: Lauri Niskanen Date: Fri, 25 Mar 2016 08:44:09 +0200 Subject: [PATCH] Preserve archive order of added and removed files --- borg/archiver.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/borg/archiver.py b/borg/archiver.py index 042a70f7c..70db0f4be 100644 --- a/borg/archiver.py +++ b/borg/archiver.py @@ -3,6 +3,7 @@ from datetime import datetime from itertools import zip_longest from operator import attrgetter import argparse +import collections import functools import hashlib import inspect @@ -546,8 +547,8 @@ class Archiver: print("{:<19} {}".format(' '.join(changes), remove_surrogates(path))) def compare_archives(archive1, archive2, matcher): - orphans_archive1 = {} - orphans_archive2 = {} + orphans_archive1 = collections.OrderedDict() + orphans_archive2 = collections.OrderedDict() hardlink_masters = {} for item1, item2 in zip_longest( archive1.iter_items(lambda item: matcher.match(item[b'path'])),