mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-19 05:49:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3692 from ThomasWaldmann/diff-deleted-empty

Browse source 
fix diff deleted/empty, fixes #3688
This commit is contained in:
TW 2018-03-17 19:41:38 +01:00 committed by GitHub
commit d7ec959ce2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/borg/archiver.py
View file

@ -1030,6 +1030,10 @@ def compare_link(item1, item2):
return 'changed link'
def contents_changed(item1, item2):
if item1.get('deleted') != item2.get('deleted'):
# a deleleted/non-existing file is considered different to an existing file,
# even if the latter is empty.
return True
if can_compare_chunk_ids:
return item1.chunks != item2.chunks
else:

4
src/borg/testsuite/archiver.py
View file

@ -3410,6 +3410,7 @@ def test_basic_functionality(self):
# Setup files for the second snapshot
self.create_regular_file('file_added', size=2048)
self.create_regular_file('file_empty_added', size=0)
os.unlink('input/file_removed')
os.unlink('input/file_removed2')
os.unlink('input/file_replaced')
@ -3484,6 +3485,9 @@ def do_asserts(output, can_compare_ids):
if are_hardlinks_supported():
assert 'added 2.05 kB input/hardlink_added' in output
# check if a diff between non-existent and empty new file is found
assert 'added 0 B input/file_empty_added' in output
# The inode has two links and both of them are deleted. They should
# appear as two deleted files.
assert 'removed 256 B input/file_removed' in output