--- a/hgext/transplant.py Tue Jan 16 12:38:26 2007 -0800
+++ b/hgext/transplant.py Tue Jan 16 12:51:02 2007 -0800
@@ -119,7 +119,8 @@
if pulls:
if source != repo:
repo.pull(source, heads=pulls, lock=lock)
- merge.update(repo, pulls[-1], wlock=wlock)
+ merge.update(repo, pulls[-1], False, False, None,
+ wlock=wlock)
p1, p2 = repo.dirstate.parents()
pulls = []
@@ -161,7 +162,7 @@
os.unlink(patchfile)
if pulls:
repo.pull(source, heads=pulls, lock=lock)
- merge.update(repo, pulls[-1], wlock=wlock)
+ merge.update(repo, pulls[-1], False, False, None, wlock=wlock)
finally:
self.saveseries(revmap, merges)
self.transplants.write()