Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 21269:fa601c4e03f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make debug output slightly more helpful by including message for action Make recently introduced messages more useful. Instead of: f1: g f2: m say: f1: remote is newer -> g f2: versions differ -> m
author Mads Kiilerich <madski@unity3d.com>
date Tue, 22 Apr 2014 02:09:24 +0200
parents a0b8a912ec81
children e741972017d9
comparison
equal deleted inserted replaced
21268:a0b8a912ec81 21269:fa601c4e03f9
760 repo.ui.note(_('\ncalculating bids for ancestor %s\n') % ancestor) 760 repo.ui.note(_('\ncalculating bids for ancestor %s\n') % ancestor)
761 actions = manifestmerge(repo, wctx, mctx, ancestor, 761 actions = manifestmerge(repo, wctx, mctx, ancestor,
762 branchmerge, force, 762 branchmerge, force,
763 partial, acceptremote, followcopies) 763 partial, acceptremote, followcopies)
764 for a in sorted(actions): 764 for a in sorted(actions):
765 repo.ui.debug(' %s: %s\n' % (a[0], a[1])) 765 f, m, args, msg = a
766 f = a[0] 766 repo.ui.debug(' %s: %s -> %s\n' % (f, msg, m))
767 if f in fbids: 767 if f in fbids:
768 fbids[f].append(a) 768 fbids[f].append(a)
769 else: 769 else:
770 fbids[f] = [a] 770 fbids[f] = [a]
771 771