Branch merging is not working
Created originally on Bitbucket by Anonymous
#!python
** Mercurial version (2.9.2). TortoiseHg version (2.11.2)
** Command:
** CWD: /Users/aaronsleadd/Documents/FieldConnect
** Encoding: US-ASCII
** Extensions loaded:
** Python version: 2.7.6 (default, Apr 11 2014, 01:45:33) [GCC 4.2.1 Compatible Apple LLVM 5.1 (clang-503.0.38)]
** System: Darwin Aarons-MacBook-Pro.local 13.1.0 Darwin Kernel Version 13.1.0: Wed Apr 2 23:52:02 PDT 2014; root:xnu-2422.92.1~2/RELEASE_X86_64 x86_64
** Qt-4.8.6 PyQt-4.10.4 QScintilla-2.8.1
Traceback (most recent call last):
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/tortoisehg/hgqt/thread.py", line 287, in run
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/tortoisehg/util/hglib.py", line 711, in dispatch
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/dispatch.py", line 810, in _dispatch
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/dispatch.py", line 590, in runcommand
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/dispatch.py", line 901, in _runcommand
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/dispatch.py", line 872, in checkargs
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/dispatch.py", line 807, in <lambda>
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/util.py", line 511, in check
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/commands.py", line 4323, in merge
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/hg.py", line 492, in merge
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/merge.py", line 927, in update
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/merge.py", line 645, in applyupdates
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/merge.py", line 211, in resolve
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/demandimport.py", line 102, in __getattribute__
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/demandimport.py", line 74, in _load
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/demandimport.py", line 43, in _hgextimport
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/filemerge.py", line 139, in <module>
File "/Applications/TortoiseHg-2.app/Contents/Resources/lib/python2.7/mercurial/filemerge.py", line 28, in decorator
AttributeError: 'NoneType' object has no attribute 'strip'