Mercurial > hg > gcmultimerge

comparison multimerge.py @ 132:16404eaf35df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Exclude "extendedProperties property.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 30 Jan 2020 13:40:40 +0200
parents 654b28ca9f39
children 3a3958edc813
comparison
equal deleted inserted replaced
131:654b28ca9f39 132:16404eaf35df
38 38
39 ## List of event tuple fields that should NOT be compared for equality 39 ## List of event tuple fields that should NOT be compared for equality
40 gcm_no_compare_fields = [ 40 gcm_no_compare_fields = [
41 "id", "iCalUID", "etag", "sequence", "gcm_cal_id", 41 "id", "iCalUID", "etag", "sequence", "gcm_cal_id",
42 "created", "updated", "htmlLink", "organizer", "creator", 42 "created", "updated", "htmlLink", "organizer", "creator",
43 "extendedProperties",
43 ] 44 ]
44 45
45 ## List of logging levels from lowest to highest 46 ## List of logging levels from lowest to highest
46 gcm_log_levels = ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG"] 47 gcm_log_levels = ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG"]
47 48