Mercurial > hg > gcmultimerge

changeset 57:1c2cf6170219

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comments.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jul 2016 23:46:18 +0300
parents 597875ef885b
children 87fda54f935c
files multimerge.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)