Mercurial > hg > gcmultimerge

changeset 86:d9e799a27ceb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make cfg.dest_id actually work.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 26 Jul 2016 15:14:52 +0300
parents da09a3b1edaa
children c3f8af496f46
files multimerge.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/multimerge.py	Tue Jul 26 15:14:44 2016 +0300
+++ b/multimerge.py	Tue Jul 26 15:14:52 2016 +0300
@@ -464,6 +464,8 @@
         if not cfg.dest_id and dst_re.match(calendar["summary"]):
             cfg.mset("dest_id", calendar["id"])
             dst_calendar = calendar
+        elif cfg.dest_id and calendar["id"] == cfg.dest_id:
+            dst_calendar = calendar
 
         # If summary or summaryOverride match the regexp, add calendar
         mre = src_re.match(calendar["summary"])