TortoiseHg Committing a merge conflict resolution causes stack trace
Created originally on Bitbucket by GrahamHelliwell (Graham Helliwell)
I tried to do a merge in TortoiseHg. Sometimes it succeeds and I manage to commit it using the wizard. But when I click working directory I get the stacktrace below. Other times it happens before commit. I imagine it's just whenever THG next refreshes the working directory state. The repo doesn't have any long file names. The .hg/merge directory is inaccessible through windows explorer too.
#!python
** Mercurial version (2.4.1). TortoiseHg version (2.6.1)
** Command: --nofork workbench
** CWD: C:\Temp\Test
** Encoding: cp1252
** Extensions loaded: win32lfn
** Python version: 2.7.3 (default, Apr 10 2012, 23:24:47) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
** Processor architecture: x64
** Qt-4.8.0 PyQt-4.9.1
Traceback (most recent call last):
File "tortoisehg\hgqt\status.pyo", line 272, in reloadComplete
File "tortoisehg\hgqt\status.pyo", line 288, in updateModel
File "mercurial\merge.pyo", line 18, in __init__
File "mercurial\merge.pyo", line 28, in _read
File "mercurial\scmutil.pyo", line 313, in __call__
File "C:\Users\Graham\hgext\win32lfn\src\win32lfn.py", line 126, in fn
File "mercurial\windows.pyo", line 35, in posixfile
IOError: [Errno 13] \\?\C:\Temp\Test\.hg\merge\state: Access is denied
Looks like it only happens when committing a merge conflict resolution.
hg init Test
cd Test
echo 1 > file.txt
hg add file.txt
hg commit -m "Base"
echo 2a > file.txt
hg commit -m "a"
hg update 0
echo 2b > file.txt
hg commit -m "b"
hg merge -t internal:local
cd ..
echo Do the commit in THG and then refresh the working directory by clicking the blue refresh icon.
pause