--- a/hgext/transplant.py Mon Sep 21 10:09:39 2020 -0700
+++ b/hgext/transplant.py Mon Sep 21 11:12:58 2020 -0700
@@ -198,7 +198,7 @@
if pulls:
if source != repo:
exchange.pull(repo, source.peer(), heads=pulls)
- merge.update(
+ merge._update(
repo, pulls[-1], branchmerge=False, force=False
)
p1 = repo.dirstate.p1()
@@ -275,7 +275,7 @@
tr.close()
if pulls:
exchange.pull(repo, source.peer(), heads=pulls)
- merge.update(repo, pulls[-1], branchmerge=False, force=False)
+ merge._update(repo, pulls[-1], branchmerge=False, force=False)
finally:
self.saveseries(revmap, merges)
self.transplants.write()