diff --git a/personal/combine/merge.py b/personal/combine/merge.py index 4f86824..c24c540 100644 --- a/personal/combine/merge.py +++ b/personal/combine/merge.py @@ -61,7 +61,7 @@ field_actions = { "comment_type": FieldAction.ALLOW_EMPTY, "controversiality": FieldAction.OVERWRITE, "created": FieldAction.OVERWRITE_IF_NONE, - "created_utc": FieldAction.ALLOW, + "created_utc": FieldAction.OVERWRITE_IF_NONE, "distinguished": FieldAction.OVERWRITE, "downs": FieldAction.OVERWRITE_IF_NONE, "editable": FieldAction.OVERWRITE, @@ -153,7 +153,7 @@ field_actions = { "content_categories": FieldAction.ALLOW, "contest_mode": FieldAction.OVERWRITE, "created": FieldAction.OVERWRITE_IF_NONE, - "created_utc": FieldAction.ALLOW, + "created_utc": FieldAction.OVERWRITE_IF_NONE, "crosspost_parent": FieldAction.ALLOW, "crosspost_parent_list": FieldAction.OVERWRITE_NOT_NONE, "discussion_type": FieldAction.ALLOW, @@ -267,6 +267,7 @@ field_actions = { "top_awarded_type": FieldAction.OVERWRITE, "total_awards_received": FieldAction.OVERWRITE_NOT_NONE, "treatment_tags": FieldAction.OVERWRITE_NOT_NONE, + "tournament_data": FieldAction.OVERWRITE_NOT_NONE, "updated_on": FieldAction.SPECIAL, "updated_utc": FieldAction.SPECIAL, "ups": FieldAction.OVERWRITE_NOT_NONE,