Mercurial > hg > gcmultimerge

changeset 131:654b28ca9f39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor fix.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 11 Nov 2019 13:47:39 +0200
parents b33e3884182b
children 16404eaf35df
files multimerge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/multimerge.py	Tue Jan 17 10:45:22 2017 +0200
+++ b/multimerge.py	Mon Nov 11 13:47:39 2019 +0200
@@ -645,7 +645,7 @@
         else:
             evn_unchanged += 1
             gcm_debug(4, u"No need to update event {0} [{1}]".format(event["id"], event["gcm_id"]))
-    elif event["status"] != u"cancelled":
+    elif event["status"] not in [u"cancelled", u"confirmed"]:
         # Event does not seem to exist. Insert new event.
         gcm_debug(4, u"Inserting new event {0} [{1}]".format(event["id"], event["gcm_id"]))
         # Remove original id field, otherwise it will clash