[Bug 4048] New: Python Exception after file/directory rename when largefiles have been added
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Wed Oct 2 02:28:26 CDT 2013
http://bz.selenic.com/show_bug.cgi?id=4048
Priority: normal
Bug ID: 4048
CC: mercurial-devel at selenic.com, natosha at gmail.com
Assignee: bugzilla at selenic.com
Summary: Python Exception after file/directory rename when
largefiles have been added
Severity: bug
Classification: Unclassified
OS: Windows
Reporter: dylan+bugz at q-games.com
Hardware: PC
Status: UNCONFIRMED
Version: 2.7.1
Component: largefiles
Product: Mercurial
We encounter a crash with mercurial when largefiles (largefile extension) have
been added to a folder that has been moved (deleted) in a different branch,
then when you try to merge with that other branch you get this:
#!python
** Mercurial version (2.7.1). TortoiseHg version (2.9.1)
** Command:
** CWD: C:\Windows\system32
** Encoding: cp932
** Extensions loaded: largefiles, zeroconf, fixtuf8
** 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=1, build=7601,
platform=2, service_pack='Service Pack 1')
** Processor architecture: x64
** Qt-4.8.4 PyQt-4.10.2 QScintilla-2.7.2
Traceback (most recent call last):
File "tortoisehg\hgqt\thread.pyo", line 283, in run
File "tortoisehg\util\hglib.pyo", line 879, in dispatch
File "mercurial\dispatch.pyo", line 778, in _dispatch
File "mercurial\dispatch.pyo", line 549, in runcommand
File "mercurial\extensions.pyo", line 188, in wrap
File "hgext\zeroconf\__init__.pyo", line 175, in cleanupafterdispatch
File "mercurial\dispatch.pyo", line 869, in _runcommand
File "mercurial\dispatch.pyo", line 840, in checkargs
File "mercurial\dispatch.pyo", line 775, in <lambda>
File "mercurial\util.pyo", line 506, in check
File "mercurial\commands.pyo", line 4292, in merge
File "mercurial\extensions.pyo", line 188, in wrap
File "hgext\largefiles\overrides.pyo", line 700, in hgmerge
File "mercurial\hg.pyo", line 482, in merge
File "mercurial\merge.pyo", line 743, in update
File "mercurial\merge.pyo", line 566, in calculateupdates
File "mercurial\extensions.pyo", line 188, in wrap
File "hgext\largefiles\overrides.pyo", line 381, in overridemanifestmerge
File "hgext\largefiles\lfutil.pyo", line 260, in splitstandin
File "mercurial\windows.pyo", line 125, in pconvert
AttributeError: 'NoneType' object has no attribute 'replace'
We had to export and import patches and then graft individual revisions to get
around this.
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list