lib/protocol: Invalid files should always lose (#4747)

2018-02-10 19:40:57 +01:00
parent 6d3f9d5154
commit 4955297bf6
3 changed files with 10 additions and 0 deletions
--- a/lib/protocol/conflict_test.go
+++ b/lib/protocol/conflict_test.go
@@ -9,6 +9,7 @@ func TestWinsConflict(t *testing.T) {
 		// The first should always win over the second
 		{{ModifiedS: 42}, {ModifiedS: 41}},
 		{{ModifiedS: 41}, {ModifiedS: 42, Deleted: true}},
+		{{Deleted: true}, {ModifiedS: 10, Invalid: true}},
 		{{ModifiedS: 41, Version: Vector{[]Counter{{42, 2}, {43, 1}}}}, {ModifiedS: 41, Version: Vector{[]Counter{{42, 1}, {43, 2}}}}},
 	}