Display conflicts to be resolved.

Marcin Kasperski Marcin.Kasperski at softax.com.pl
Thu Aug 9 05:12:06 CDT 2007


> You're right. It's in crew but hasn't propagated yet. In the mean
> time, it can be gotten here:
>
> http://hg.kublai.com/mercurial/crew/raw-file/tip/hgext/imerge.py

Sth is wrong (mercurial 0.9.4 on python2.4, imerge.py just downloaded):

$ 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 0.9.4)
Traceback (most recent call last):
  File "/usr/bin/hg", line 11, in ?
    mercurial.commands.run()
  File "/var/lib/python-support/python2.4/mercurial/commands.py", line 3110, in run
    sys.exit(dispatch(sys.argv[1:], argv0=sys.argv[0]))
  File "/var/lib/python-support/python2.4/mercurial/commands.py", line 3107, in dispatch
    return cmdutil.runcatch(u, args, argv0=argv0)
  File "/var/lib/python-support/python2.4/mercurial/cmdutil.py", line 37, in runcatch
    return dispatch(ui, args, argv0=argv0)
  File "/var/lib/python-support/python2.4/mercurial/cmdutil.py", line 364, in dispatch
    ret = runcommand(ui, options, cmd, d)
  File "/var/lib/python-support/python2.4/mercurial/cmdutil.py", line 417, in runcommand
    return checkargs()
  File "/var/lib/python-support/python2.4/mercurial/cmdutil.py", line 373, in checkargs
    return cmdfunc()
  File "/var/lib/python-support/python2.4/mercurial/cmdutil.py", line 356, in <lambda>
    d = lambda: func(ui, repo, *args, **cmdoptions)
  File "/usr/local/lib/python2.4/site-packages/imerge.py", line 349, in imerge
    im.start(rev=rev)
  File "/usr/local/lib/python2.4/site-packages/imerge.py", line 124, in start
    commands.merge(self.ui, self.repo, rev=rev)
  File "/var/lib/python-support/python2.4/mercurial/commands.py", line 1920, in merge
    return hg.merge(repo, node, force=force)
  File "/var/lib/python-support/python2.4/mercurial/hg.py", line 270, in merge
    stats = _merge.update(repo, node, True, force, False, wlock)
  File "/var/lib/python-support/python2.4/mercurial/merge.py", line 554, in update
    stats = applyupdates(repo, action, wc, p2)
  File "/var/lib/python-support/python2.4/mercurial/merge.py", line 396, in applyupdates
    r = filemerge(repo, f, f2, wctx, mctx)
TypeError: filemerge() takes exactly 6 arguments (5 given)



More information about the Mercurial mailing list