Mercurial > hg-stable

diff 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
line wrap: on
line diff
--- a/mercurial/merge.py	Sun May 13 17:45:08 2012 +0200
+++ b/mercurial/merge.py	Tue Apr 22 02:09:24 2014 +0200
@@ -762,8 +762,8 @@
                                     branchmerge, force,
                                     partial, acceptremote, followcopies)
             for a in sorted(actions):
-                repo.ui.debug(' %s: %s\n' % (a[0], a[1]))
-                f = a[0]
+                f, m, args, msg = a
+                repo.ui.debug(' %s: %s -> %s\n' % (f, msg, m))
                 if f in fbids:
                     fbids[f].append(a)
                 else: