Mercurial > hg > gcmultimerge

comparison multimerge.py @ 72:1ab40033bb87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add 'creator' to event equality comparision excluded fields.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 12 Jul 2016 11:19:38 +0300
parents 41881ba09ba8
children b3f8621f1a25
comparison
equal deleted inserted replaced
71:41881ba09ba8 72:1ab40033bb87
32 ### 32 ###
33 ### Misc. helper functions 33 ### Misc. helper functions
34 ### 34 ###
35 gcm_no_compare_fields = [ 35 gcm_no_compare_fields = [
36 "id", "iCalUID", "etag", "sequence", "gcm_cal_id", 36 "id", "iCalUID", "etag", "sequence", "gcm_cal_id",
37 "created", "updated", "htmlLink", "organizer", 37 "created", "updated", "htmlLink", "organizer", "creator",
38 ] 38 ]
39 39
40 40
41 ## Wrapper for print() that does not break when redirecting stdin/out 41 ## Wrapper for print() that does not break when redirecting stdin/out
42 ## because of piped output not having a defined encoding. We default 42 ## because of piped output not having a defined encoding. We default