[issue2702] merge fails with TypeError("'NoneType' object is not iterable", )

[Mike Travers]

New submission from Mike Travers <mt at alum.mit.edu>:

I have a large repository, for some reason now I can't merge branches.  
Upgrading mercurial to 1.8.1 didn't help, hg verify reports no problems.  
Help!



bash-3.2$ hg merge --fold newrelease
** unknown exception encountered, please report by visiting
**  http://mercurial.selenic.com/wiki/BugTracker
** Python 2.6.1 (r261:67515, Jun 24 2010, 21:47:49) [GCC 4.2.1 (Apple Inc. 
build 5646)]
** Mercurial Distributed SCM (version 1.8.1+20110310)
** Extensions loaded: convert, churn, hggit, hgk, fold
Traceback (most recent call last):
  File "/usr/local/bin/hg", line 38, in <module>
    mercurial.dispatch.run()
  File "/Library/Python/2.6/site-packages/mercurial/dispatch.py", line 16, 
in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/Library/Python/2.6/site-packages/mercurial/dispatch.py", line 36, 
in dispatch
    return _runcatch(u, args)
  File "/Library/Python/2.6/site-packages/mercurial/dispatch.py", line 58, 
in _runcatch
    return _dispatch(ui, args)
  File "/Library/Python/2.6/site-packages/mercurial/dispatch.py", line 601, 
in _dispatch
    cmdpats, cmdoptions)
  File "/Library/Python/2.6/site-packages/mercurial/dispatch.py", line 406, 
in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/Library/Python/2.6/site-packages/mercurial/dispatch.py", line 655, 
in _runcommand
    return checkargs()
  File "/Library/Python/2.6/site-packages/mercurial/dispatch.py", line 609, 
in checkargs
    return cmdfunc()
  File "/Library/Python/2.6/site-packages/mercurial/dispatch.py", line 598, 
in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/Library/Python/2.6/site-packages/mercurial/util.py", line 433, in 
check
    return func(*args, **kwargs)
  File "/misc/repos/hgfold/fold.py", line 969, in wrapper
    return newFunction( ui, repo, original=callOriginal, *args, **opts)
  File "/misc/repos/hgfold/fold.py", line 928, in foldMerge
    stats = merger.merge(force=force)
  File "/misc/repos/hgfold/fold.py", line 812, in merge
    stats = self.bareMerge(force)
  File "/misc/repos/hgfold/fold.py", line 823, in bareMerge
    statlist = hgupdate( self.repo, self.foldRev, True, force, 
hasNoConflicts)
  File "/misc/repos/hgfold/fold.py", line 144, in hgupdate
    merge._checkunknown(wc, p2)
  File "/Library/Python/2.6/site-packages/mercurial/merge.py", line 86, in 
_checkunknown
    for f in wctx.unknown():
  File "/Library/Python/2.6/site-packages/mercurial/context.py", line 711, 
in unknown
    assert self._unknown is not None  # must call status first
AssertionError
Exception TypeError: TypeError("'NoneType' object is not iterable",) in 
<bound method lock.__del__ of <mercurial.lock.lock object at 0x10060ae90>> 
ignored

----------
messages: 15661
nosy: mt
priority: urgent
status: unread
title: merge fails with TypeError("'NoneType' object is not iterable",)
topic: merge

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2702>
____________________________________________________