From patchwork Fri Aug 25 06:40:37 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D379: simplemerge: use context paths for default labels instead of
 file paths
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 23329
Message-Id: <327a02b6aeaaf1ea8699b8bd259cdc4e@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Fri, 25 Aug 2017 06:40:37 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1915a5e809ca: simplemerge: use context paths for default labels instead of file paths (authored by phillco).

REPOSITORY
  rHG Mercurial

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

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

AFFECTED FILES
  mercurial/simplemerge.py

CHANGE DETAILS




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

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: