D2889: filemerge: make the 'local' path match the format that 'base' and 'other' use

yuja (Yuya Nishihara) phabricator at mercurial-scm.org
Wed Mar 21 00:23:42 EDT 2018


yuja added a comment.


  Can't apply.
  
    % hg up -C a4a95bd7
    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
    
    % hg pimp D2889
    devel-warn: accessing unregistered config item: 'phabricator.batchsize' at: /home/yuya/work/hghacks/mercurial/mercurial/ui.py:624 (configwith)
    devel-warn: accessing unregistered config item: 'phabricator.url' at: /home/yuya/work/hghacks/mercurial/contrib/phabricator.py:124 (readurltoken)
    devel-warn: accessing unregistered config item: 'phabricator.token' at: /home/yuya/work/hghacks/mercurial/contrib/phabricator.py:111 (readlegacytoken)
    phabricator.token is deprecated - please migrate to the phabricator.auth section.
    devel-warn: accessing unregistered config item: 'phabricator.curlcmd' at: /home/yuya/work/hghacks/mercurial/contrib/phabricator.py:162 (callconduit)
    applying patch from stdin
    devel-warn: accessing unregistered config item: 'phabricator.url' at: /home/yuya/work/hghacks/mercurial/contrib/phabricator.py:124 (readurltoken)
    devel-warn: accessing unregistered config item: 'phabricator.token' at: /home/yuya/work/hghacks/mercurial/contrib/phabricator.py:111 (readlegacytoken)
    devel-warn: accessing unregistered config item: 'phabricator.curlcmd' at: /home/yuya/work/hghacks/mercurial/contrib/phabricator.py:162 (callconduit)
    devel-warn: accessing unregistered config item: 'phabricator.url' at: /home/yuya/work/hghacks/mercurial/contrib/phabricator.py:124 (readurltoken)
    devel-warn: accessing unregistered config item: 'phabricator.token' at: /home/yuya/work/hghacks/mercurial/contrib/phabricator.py:111 (readlegacytoken)
    devel-warn: accessing unregistered config item: 'phabricator.curlcmd' at: /home/yuya/work/hghacks/mercurial/contrib/phabricator.py:162 (callconduit)
    patching file tests/test-merge-tools.t
    Hunk #2 FAILED at 1599
    1 out of 2 hunks FAILED -- saving rejects to file tests/test-merge-tools.t.rej
    patching file mercurial/filemerge.py
    Hunk #1 FAILED at 511
    Hunk #3 FAILED at 663
    2 out of 3 hunks FAILED -- saving rejects to file mercurial/filemerge.py.rej
    abort: patch failed to apply

REPOSITORY
  rHG Mercurial

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

To: spectral, #hg-reviewers, yuja
Cc: yuja, mercurial-devel


More information about the Mercurial-devel mailing list