Mercurial > hg > gcmultimerge

comparison multimerge.py @ 41:9eadb97a2e98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comment out debugging.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jul 2016 14:11:26 +0300
parents 56558cd6d035
children ac949d2b268a
comparison
equal deleted inserted replaced
40:56558cd6d035 41:9eadb97a2e98
418 418
419 for event in src_events: 419 for event in src_events:
420 # Does the event exist already in the target? 420 # Does the event exist already in the target?
421 if event["gcm_id"] in dst_gcm_ids: 421 if event["gcm_id"] in dst_gcm_ids:
422 ## Yes. Thus, we just update the event. 422 ## Yes. Thus, we just update the event.
423 print "IS in dst_gcm_ids: "+ event["id"] +" : "+ event["gcm_id"] 423 #print "IS in dst_gcm_ids: "+ event["id"] +" : "+ event["gcm_id"]
424 # Check if event NEEDS updating .. aka compare data 424 # Check if event NEEDS updating .. aka compare data
425 #d_event = gcm_get_event_by_gcm_id(dst_events, event["gcm_id"]) 425 #d_event = gcm_get_event_by_gcm_id(dst_events, event["gcm_id"])
426 #if d_event and gcm_compare_events(event, d_event): 426 #if d_event and gcm_compare_events(event, d_event):
427 if True: 427 if True:
428 try: 428 try: