Mercurial > hg > mercurial-crew-with-dirclash

diff hgext/transplant.py @ 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 da3dc89f1e9a
children 863465381028
line wrap: on
line diff
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -119,7 +119,8 @@ class transplanter:
                     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 @@ class transplanter:
                             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()