# HG changeset patch # User Matti Hamalainen # Date 1467751578 -10800 # Node ID 1c2cf61702195b46b2801ee7bbcbf75af4889545 # Parent 597875ef885b6936eb4b7b4f7458b2256151700b Comments. diff -r 597875ef885b -r 1c2cf6170219 multimerge.py --- a/multimerge.py Tue Jul 05 23:01:00 2016 +0300 +++ b/multimerge.py Tue Jul 05 23:46:18 2016 +0300 @@ -455,12 +455,11 @@ for event in src_events: # Does the event exist already in the target? if event["gcm_id"] in dst_ids: - ## Yes. Thus, we just update the event. - #print "IS in dst_ids: "+ event["id"] +" : "+ event["gcm_id"] # Check if event NEEDS updating .. aka compare data gcm_debug(u"Event {0} exists, checking ..".format(event["gcm_id"])) d_event = gcm_get_event_by_gcm_id(dst_events, event["gcm_id"]) if not gcm_compare_events(event, d_event): + # Seems we need to update gcm_debug(u"Updating event {0} ..".format(event["gcm_id"])) try: event.pop("sequence", None)