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

Merge Bug

Anonymous created an issue

{{{

!python

Mercurial version (1.8.3). TortoiseHg version (2.0.4) Command: --nofork workbench CWD: D:\workspace\gatx1estavel Extensions loaded: fixfrozenexts Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)] Windows version: (5, 1, 2600, 2, 'Service Pack 3') Processor architecture: x86 Qt-4.7.1 PyQt-4.8.3 Traceback (most recent call last): File "tortoisehg\hgqt\merge.pyo", line 123, in initializePage File "tortoisehg\hgqt\merge.pyo", line 638, in get_pane File "mercurial\ui.pyo", line 175, in configbool ConfigError: tortoisehg.engmsg not a boolean ('Primeira atualização.') Traceback (most recent call last): File "tortoisehg\hgqt\merge.pyo", line 720, in isComplete AttributeError: 'CommitPage' object has no attribute 'msg_text' Traceback (most recent call last): File "tortoisehg\hgqt\merge.pyo", line 720, in isComplete AttributeError: 'CommitPage' object has no attribute 'msg_text' Traceback (most recent call last): File "tortoisehg\hgqt\merge.pyo", line 720, in isComplete AttributeError: 'CommitPage' object has no attribute 'msg_text' Traceback (most recent call last): File "tortoisehg\hgqt\merge.pyo", line 720, in isComplete AttributeError: 'CommitPage' object has no attribute 'msg_text' Traceback (most recent call last): File "tortoisehg\hgqt\merge.pyo", line 141, in setVisible File "tortoisehg\hgqt\merge.pyo", line 90, in switch_pane File "tortoisehg\hgqt\merge.pyo", line 689, in ready AttributeError: 'CommitPage' object has no attribute 'msg_text' Traceback (most recent call last): File "tortoisehg\hgqt\merge.pyo", line 720, in isComplete AttributeError: 'CommitPage' object has no attribute 'msg_text'

}}}

Comments (4)

  1. Steve Borho

    You've misconfigured "Settings -> Commit -> English Messages". It should be true or false. Once you fix that setting the merge tool will be fine.

    I thought we were catching those exceptions but I just realized we're only catching ParseError and not ConfigError

  2. Log in to comment