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

Local merge fails, and says it's waiting for a lock on a local directory

Anonymous created an issue

{{{

!python

Mercurial version (1.8.1). TortoiseHg version (2.0.2) Command: --nofork workbench CWD: C:\dev\masspp Extensions loaded: fixfrozenexts, mq Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)] Windows version: (6, 1, 7600, 2, '') Processor architecture: x64 Qt-4.7.1 PyQt-4.8.2 Traceback (most recent call last): File "tortoisehg\hgqt\merge.pyo", line 196, in cancel_clicked File "tortoisehg\hgqt\merge.pyo", line 400, in cancel AttributeError: 'Widget' object has no attribute 'outputLog'

}}}

Comments (2)

  1. Log in to comment