Mercurial > hg-stable

changeset 4035:c8f26bd24e86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update transplant's merge.update call
author Brendan Cully <brendan@kublai.com>
date Tue, 16 Jan 2007 12:51:02 -0800
parents 9bd078ce8de9
children ebf1a05f6479
files hgext/transplant.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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()