diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-04-30 20:10:09 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-30 22:06:47 -0700 |
| commit | 747c9a377fb73aa30f6b4dca958e3b121f88bb66 (patch) | |
| tree | 689ad7a6f5754007357c78772eba035193e440a3 /contrib/remote-helpers/git-remote-bzr | |
| parent | remote-bzr: iterate revisions properly (diff) | |
| download | tgif-747c9a377fb73aa30f6b4dca958e3b121f88bb66.tar.xz | |
remote-bzr: delay peer branch usage
So it doesn't time out.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/remote-helpers/git-remote-bzr')
| -rwxr-xr-x | contrib/remote-helpers/git-remote-bzr | 6 |
1 files 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 |