File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -687,7 +687,7 @@ def do_export(parser):
687
687
branch .generate_revision_history (revid , marks .get_tip (name ))
688
688
689
689
if name in peers :
690
- peer = peers [name ]
690
+ peer = bzrlib . branch . Branch . open ( peers [name ])
691
691
try :
692
692
peer .bzrdir .push_branch (branch , revision_id = revid )
693
693
except bzrlib .errors .DivergedBranches :
@@ -825,7 +825,7 @@ def get_repo(url, alias):
825
825
branch = origin .open_branch ()
826
826
827
827
if not is_local :
828
- peers [name ] = branch
828
+ peers [name ] = branch . base
829
829
branches [name ] = get_remote_branch (origin , branch , name )
830
830
else :
831
831
branches [name ] = branch
@@ -841,7 +841,7 @@ def get_repo(url, alias):
841
841
for name , branch in find_branches (repo , wanted ):
842
842
843
843
if not is_local :
844
- peers [name ] = branch
844
+ peers [name ] = branch . base
845
845
branches [name ] = get_remote_branch (origin , branch , name )
846
846
else :
847
847
branches [name ] = branch
You can’t perform that action at this time.
0 commit comments