1. TortoiseHg
  2. TortoiseHg
  3. thg
  4. Issues
Issue #1336 resolved

Trying merge local than cancel commit...

Anonymous created an issue

{{{

!python

Mercurial version (1.9.1). TortoiseHg version (2.1.2) Command: --nofork workbench CWD: C:\Projects\HG\DTKiosk\Main Encoding: cp1251 Extensions loaded: Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)] Windows version: (6, 1, 7601, 2, 'Service Pack 1') Processor architecture: x64 ** Qt-4.7.1 PyQt-4.8.3 Traceback (most recent call last): File "tortoisehg\hgqt\merge.pyo", line 636, in run File "mercurial\context.pyo", line 809, in dirty File "mercurial\context.pyo", line 727, in modified File "mercurial\util.pyo", line 169, in get File "mercurial\context.pyo", line 681, in _status File "mercurial\localrepo.pyo", line 1200, in status File "mercurial\dirstate.pyo", line 676, in status File "mercurial\dirstate.pyo", line 623, in walk File "mercurial\windows.pyo", line 208, in statfiles WindowsError: [Error 5] : 'c:\projects\hg\dtkiosk\main\3rdparty\moq\net35'

}}}

Comments (1)

  1. Log in to comment