So it doesn't time out.
Signed-off-by: Felipe Contreras <[email protected]>
---
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 66e3861..b2d67f7 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
--
1.8.3.rc0.399.gc96a135
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
