# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1168980662 28800
# Node ID c8f26bd24e8652f6dc66680dfc51187e335b5408
# Parent  9bd078ce8de91c41f652e50a34f0dce01374a247
Update transplant's merge.update call

diff -r 9bd078ce8de9 -r c8f26bd24e86 hgext/transplant.py
--- 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()