Mercurial > hg

changeset 23320:296b09dcef63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifestmerge: use already existing fl2 synonym for m2.flags(f) Probably not a noticeable performance gain, but shortens the code slightly.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 14 Nov 2014 09:33:28 -0800
parents 3177d710630d
children d716b1cec5cf
files mercurial/merge.py
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Nov 13 23:12:15 2014 -0800
+++ b/mercurial/merge.py	Fri Nov 14 09:33:28 2014 -0800
@@ -514,11 +514,9 @@
             else:
                 # if different: old untracked f may be overwritten and lost
                 if acceptremote:
-                    actions['g'].append((f, (m2.flags(f),),
-                                   "remote recreating"))
+                    actions['g'].append((f, (fl2,), "remote recreating"))
                 else:
-                    actions['dc'].append((f, (m2.flags(f),),
-                                   "prompt deleted/changed"))
+                    actions['dc'].append((f, (fl2,), "prompt deleted/changed"))
 
     for f, m in sorted(aborts):
         if m == "ud":