[Bug 5020] New: merge fails with "abort: No such file or directory"

[mercurial-bugs at selenic.com]

https://bz.mercurial-scm.org/show_bug.cgi?id=5020

            Bug ID: 5020
           Summary: merge fails with "abort: No such file or directory"
           Product: Mercurial
           Version: 3.6.2
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: bug
          Priority: normal
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: mr.dmitry.sokolov at gmail.com
                CC: mercurial-devel at selenic.com

Created attachment 1886
  --> https://bz.mercurial-scm.org/attachment.cgi?id=1886&action=edit
log.txt.zip

Command

    hg version -v

Mercurial Distributed SCM (version 3.6.2)
(see https://mercurial-scm.org for more information)

Copyright (C) 2005-2015 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Enabled extensions:

  largefiles
  convert
  strip
  mq
  onsub
  shelve
  bugzilla
  color
  transplant
  mercurial_keyring
  purge
  histedit

    hg update -C default
    hg purge --all
    hg merge --tool :fail --traceback --verbose  branch_name

Error

...
moving Cloud/Server/app/public/js/teigha-lib.js to
Cloud/Server/NodeJS/modules/cloud/public/js/teigha-lib.js

Traceback (most recent call last):
  File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 187, in
_runcatch
    return _dispatch(req)
  File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 920, in
_dispatch
    cmdpats, cmdoptions)
  File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 679, in
runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 1051, in
_runcommand
    return checkargs()
  File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 1011, in
checkargs
    return cmdfunc()
  File "/usr/lib/python2.7/site-packages/mercurial/dispatch.py", line 917, in
<lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/usr/lib/python2.7/site-packages/mercurial/util.py", line 801, in check
    return func(*args, **kwargs)
  File "/usr/lib/python2.7/site-packages/mercurial/commands.py", line 4951, in
merge
    return hg.merge(repo, node, force=opts.get('force'))
  File "/usr/lib/python2.7/site-packages/mercurial/hg.py", line 656, in merge
    stats = mergemod.update(repo, node, True, force, False)
  File "/usr/lib/python2.7/site-packages/mercurial/merge.py", line 1279, in
update
    stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)
  File "/usr/lib/python2.7/site-packages/mercurial/merge.py", line 921, in
applyupdates
    repo.wwrite(f, wctx.filectx(f0).data(), flags)
  File "/usr/lib/python2.7/site-packages/mercurial/context.py", line 1685, in
data
    return self._repo.wread(self._path)
  File "/usr/lib/python2.7/site-packages/mercurial/localrepo.py", line 932, in
wread
    data = self.wvfs.read(filename)
  File "/usr/lib/python2.7/site-packages/mercurial/scmutil.py", line 251, in
read
    fp = self(path, 'rb')
  File "/usr/lib/python2.7/site-packages/mercurial/scmutil.py", line 516, in
__call__
    fp = util.posixfile(f, mode)

IOError: [Errno 2] No such file or directory:
'/c/Dev/Projects/ITC/Teigha/Cloud/Server/app/public/js/teigha-lib.js'

abort: No such file or directory:
/c/Dev/Projects/ITC/Teigha/Cloud/Server/app/public/js/teigha-lib.js


This file existed before `merge` command was called. And in the log I can see

 ...
 Cloud/Server/app/public/js/teigha-lib.js: consensus for r
 ...

So, it looks like the file is deleted by `hg` during merge operation.

I tried

    hg.exe v3.6.2 64bit for Windows (from TortoiseHg)
    hg v3.6.1 for MSys2

-- 
You are receiving this mail because:
You are on the CC list for the bug.