Mercurial > hg > gcmultimerge

changeset 64:c4b8d934d7ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix list of event fields to compare for equality.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 11 Jul 2016 14:04:50 +0300
parents 6e38692e341f
children 1eefa9b5e945
files multimerge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/multimerge.py	Mon Jul 11 13:51:54 2016 +0300
+++ b/multimerge.py	Mon Jul 11 14:04:50 2016 +0300
@@ -125,7 +125,7 @@
     return None
 
 
-gcm_no_compare_fields = [u"id", u"iCalUID"]
+gcm_no_compare_fields = [u"id", u"iCalUID", "etag", "sequence", "created", "htmlLink", "gcm_cal_id", "organizer", "updated"]
 
 def gcm_compare_events(ev1, ev2):
     for field in ev1: