Commit 649b915f authored by Libor Peltan's avatar Libor Peltan Committed by Daniel Salzman

update: same changeset cancelout strategy for merge like add/rem

parent 845ac32f
......@@ -555,7 +555,7 @@ int zone_update_apply_changeset(zone_update_t *update, const changeset_t *change
{
int ret = KNOT_EOK;
if (update->flags & UPDATE_INCREMENTAL) {
ret = changeset_merge(&update->change, changes, CHANGESET_CHECK_CANCELOUT);
ret = changeset_merge(&update->change, changes, changeset_flags(update));
}
if (ret == KNOT_EOK) {
ret = apply_changeset_directly(update->a_ctx, changes);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment