Mercurial > hg > gcmultimerge
changeset 121:4500fbf91294 rel-1.0
More comments.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 18 Oct 2016 15:12:54 +0300 |
parents | 1f7967aa0133 |
children | 155056498592 |
files | multimerge.py |
diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/multimerge.py Tue Oct 18 15:05:55 2016 +0300 +++ b/multimerge.py Tue Oct 18 15:12:54 2016 +0300 @@ -624,6 +624,7 @@ # Seems we need to update gcm_debug(4, u"Updating event {0} [{1}]".format(event["id"], event["gcm_id"])) try: + # We need to remove the sequence and id fields, as they will be replaced by target event.pop("sequence", None) event.pop("id", None) event["iCalUID"] = event["gcm_id"] @@ -637,6 +638,7 @@ elif event["status"] != u"cancelled": # Event does not seem to exist. Insert new event. gcm_debug(4, u"Inserting new event {0} [{1}]".format(event["id"], event["gcm_id"])) + # Remove original id field, otherwise it will clash event.pop("id", None) event["iCalUID"] = event["gcm_id"] # Replace Google generated ID with our own try: