Exception error in new merge backend

[dhruva]

Hi,
 I am using the new merge backend. I get the following error when I
use it with imerge/merge. I am merging multiple heads resulting from a
pull from a different branch.

The relevant contents of my Mercurial.ini (on M$):

[merge-tools]
kdiff3.priority	= 1
kdiff3.gui	= True
kdiff3.args	= --auto -L1 base --L2 local --L3 other $base $local
$other -o $output

copy.priotity	= 1
copy.gui	= False
copy.args	= copy $other $local

[merge-patterns]
**.c		= kdiff3
**.cpp		= kdiff3
**.h		= kdiff3
**.hxx		= kdiff3
**.py		= kdiff3
**.zip		= copy


-------- ERROR MESSAGE ---------

S:\DEVEL
[dky]hg imerge
** unknown exception encountered, details follow
** report bug details to http://www.selenic.com/mercurial/bts
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 83d193a513c8)
Traceback (most recent call last):
  File "C:\python\Scripts\hg", line 20, in <module>
    mercurial.dispatch.run()
  File "C:\python\Lib\site-packages\mercurial\dispatch.py", line 20, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "C:\python\Lib\site-packages\mercurial\dispatch.py", line 29, in dispatch
    return _runcatch(u, args)
  File "C:\python\Lib\site-packages\mercurial\dispatch.py", line 45,
in _runcatch
    return _dispatch(ui, args)
  File "C:\python\Lib\site-packages\mercurial\dispatch.py", line 360,
in _dispatch
    ret = _runcommand(ui, options, cmd, d)
  File "C:\python\Lib\site-packages\mercurial\dispatch.py", line 376,
in _runcommand
    return profiled(ui, checkargs, options)
  File "C:\python\Lib\site-packages\mercurial\dispatch.py", line 424,
in profiled
    return func()
  File "C:\python\Lib\site-packages\mercurial\dispatch.py", line 369,
in checkargs
    return cmdfunc()
  File "C:\python\Lib\site-packages\mercurial\dispatch.py", line 352,
in <lambda>
    d = lambda: func(ui, repo, *args, **cmdoptions)
  File "C:\python\Lib\site-packages\hgext\imerge.py", line 398, in imerge
    return dispatch_(im, args, opts)
  File "C:\python\Lib\site-packages\hgext\imerge.py", line 328, in dispatch_
    return func(im, *args, **opts)
  File "C:\python\Lib\site-packages\hgext\imerge.py", line 228, in merge_
    rc = im.filemerge(filename, interactive=not auto)
  File "C:\python\Lib\site-packages\hgext\imerge.py", line 130, in filemerge
    return filemerge.filemerge(self.repo, fn, fd, fo, self.wctx, p2)
  File "C:\python\Lib\site-packages\mercurial\filemerge.py", line 127,
in filemerge
    tool = _picktool(repo, ui, fw, binary, symlink)
  File "C:\python\Lib\site-packages\mercurial\filemerge.py", line 51,
in _picktool
    mf = util.matcher(repo.root, "", [pat], [], [])[1]
NameError: global name 'pat' is not defined

-dky

-- 
Contents reflect my personal views only!