Patchwork D379: simplemerge: use context paths for default labels instead of file paths

login
register
mail settings
Submitter phabricator
Date Aug. 17, 2017, 6:40 p.m.
Message ID <f946f6ba46718647d3fe9cfcae7ca8c7@localhost.localdomain>
Download mbox | patch
Permalink /patch/23103/
State Not Applicable
Headers show

Comments

phabricator - Aug. 17, 2017, 6:40 p.m.
phillco updated this revision to Diff 1039.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D379?vs=860&id=1039

REVISION DETAIL
  https://phab.mercurial-scm.org/D379

AFFECTED FILES
  mercurial/simplemerge.py

CHANGE DETAILS




To: phillco, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -461,8 +461,8 @@ 
     mode = opts.get('mode','merge')
     name_a, name_b, name_base = None, None, None
     if mode != 'union':
-        name_a, name_b, name_base = _picklabels([localfile,
-                                                 otherfile, None],
+        name_a, name_b, name_base = _picklabels([localctx.path(),
+                                                 otherctx.path(), None],
                                                 opts.get('label', []))
 
     try: