Merge pull request #242 from kmala/master

deep copy slice object during append

Author: k8s-ci-robot

merge/conflict.go

@@ -112,7 +112,7 @@ func ConflictsFromManagers(sets fieldpath.ManagedFields) Conflicts {
 		set.Set().Iterate(func(p fieldpath.Path) {
 			conflicts = append(conflicts, Conflict{
 				Manager: manager,
-				Path:    p,
+				Path:    p.Copy(),
 			})
 		})
 	}

merge/conflict_test.go

@@ -92,3 +92,22 @@ func TestToSet(t *testing.T) {
 		t.Fatalf("expected\n%v\n, but got\n%v\n", expected, actual)
 	}
 }
+
+func TestConflictsFromManagers(t *testing.T) {
+	got := merge.ConflictsFromManagers(fieldpath.ManagedFields{
+		"Bob": fieldpath.NewVersionedSet(
+			_NS(
+				_P("obj", "template", "obj", "list", _KBF("name", "a"), "id"),
+				_P("obj", "template", "obj", "list", _KBF("name", "a"), "key"),
+			),
+			"v1",
+			false,
+		),
+	})
+	wanted := `conflicts with "Bob":
+- .obj.template.obj.list[name="a"].id
+- .obj.template.obj.list[name="a"].key`
+	if got.Error() != wanted {
+		t.Errorf("Got %v, wanted %v", got.Error(), wanted)
+	}
+}