[issue488] Traceback using transplant extension

[Diab Jerius]

New submission from Diab Jerius <djerius at cfa.harvard.edu>:

I'm getting the attached traceback when using transplant to apply a changeset
from another repository.  Here's the sequence of events:

% hg clone -r V1_1_1 scatter scatter-1.1.1-play
% cd scatter-1.1.1-play
[changes]
% hg ci -m 'update snippets'
% cd ..
% hg clone scatter scatter.debug
% cd scatter.debug
% hg update V1_1_1
55 files updated, 0 files merged, 58 files removed, 0 files unresolved
macabre% hg transplant -s ../scatter-1.1.1-play tip
searching for changes
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 9 changes to 9 files (+1 heads)
Traceback (most recent call last):
  File "/proj/axaf/pkgs/mercurial-0.9.3/bin/hg.exe", line 12, in ?
    commands.run()
  File
"/proj/axaf/pkgs/mercurial-0.9.3/x86_64-Linux-2.6_2/lib/python2.4/site-packages/mercurial/commands.py",
line 3000, in run
    sys.exit(dispatch(sys.argv[1:]))
  File
"/proj/axaf/pkgs/mercurial-0.9.3/x86_64-Linux-2.6_2/lib/python2.4/site-packages/mercurial/commands.py",
line 3223, in dispatch
    return d()
  File
"/proj/axaf/pkgs/mercurial-0.9.3/x86_64-Linux-2.6_2/lib/python2.4/site-packages/mercurial/commands.py",
line 3182, in <lambda>
    d = lambda: func(u, repo, *args, **cmdoptions)
  File
"/proj/axaf/pkgs/mercurial-0.9.3/x86_64-Linux-2.6_2/lib/python2.4/site-packages/hgext/transplant.py",
line 575, in transplant
    tp.apply(repo, source, revmap, merges, opts)
  File
"/proj/axaf/pkgs/mercurial-0.9.3/x86_64-Linux-2.6_2/lib/python2.4/site-packages/hgext/transplant.py",
line 165, in apply
    merge.update(repo, pulls[-1], wlock=wlock)
TypeError: update() takes exactly 6 non-keyword arguments (2 given)

----------
messages: 2726
nosy: djerius
priority: bug
status: unread
title: Traceback using transplant extension

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