Skip to content

Commit 747c9a3

Browse files
felipecgitster
authored andcommitted
remote-bzr: delay peer branch usage
So it doesn't time out. Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 38cecbd commit 747c9a3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

contrib/remote-helpers/git-remote-bzr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ def do_export(parser):
687687
branch.generate_revision_history(revid, marks.get_tip(name))
688688

689689
if name in peers:
690-
peer = peers[name]
690+
peer = bzrlib.branch.Branch.open(peers[name])
691691
try:
692692
peer.bzrdir.push_branch(branch, revision_id=revid)
693693
except bzrlib.errors.DivergedBranches:
@@ -825,7 +825,7 @@ def get_repo(url, alias):
825825
branch = origin.open_branch()
826826

827827
if not is_local:
828-
peers[name] = branch
828+
peers[name] = branch.base
829829
branches[name] = get_remote_branch(origin, branch, name)
830830
else:
831831
branches[name] = branch
@@ -841,7 +841,7 @@ def get_repo(url, alias):
841841
for name, branch in find_branches(repo, wanted):
842842

843843
if not is_local:
844-
peers[name] = branch
844+
peers[name] = branch.base
845845
branches[name] = get_remote_branch(origin, branch, name)
846846
else:
847847
branches[name] = branch

0 commit comments

Comments
 (0)