// TODO: this will not work for name name siblings!
it.remove();
break;
}
} else if (op instanceof AddProperty) {
AddProperty operation = (AddProperty) op;
if (operation.getParentState() == parent
&& operation.getPropertyName().equals(state.getName())) {
it.remove();
break;
}
} else if (op instanceof SetMixin &&
NameConstants.JCR_MIXINTYPES.equals(state.getName()) &&