From 747c9a377fb73aa30f6b4dca958e3b121f88bb66 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Tue, 30 Apr 2013 20:10:09 -0500 Subject: [PATCH] remote-bzr: delay peer branch usage So it doesn't time out. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- contrib/remote-helpers/git-remote-bzr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 66e3861c21..b2d67f7f37 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -687,7 +687,7 @@ def do_export(parser): branch.generate_revision_history(revid, marks.get_tip(name)) if name in peers: - peer = peers[name] + peer = bzrlib.branch.Branch.open(peers[name]) try: peer.bzrdir.push_branch(branch, revision_id=revid) except bzrlib.errors.DivergedBranches: @@ -825,7 +825,7 @@ def get_repo(url, alias): branch = origin.open_branch() if not is_local: - peers[name] = branch + peers[name] = branch.base branches[name] = get_remote_branch(origin, branch, name) else: branches[name] = branch @@ -841,7 +841,7 @@ def get_repo(url, alias): for name, branch in find_branches(repo, wanted): if not is_local: - peers[name] = branch + peers[name] = branch.base branches[name] = get_remote_branch(origin, branch, name) else: branches[name] = branch -- 2.11.4.GIT