Merge branch 'fc/remote-bzr'
* fc/remote-bzr: remote-bzr: use proper push method
This commit is contained in:
commit
df8597258e
@ -633,12 +633,12 @@ def do_export(parser):
|
||||
for ref, revid in parsed_refs.iteritems():
|
||||
if ref == 'refs/heads/master':
|
||||
repo.generate_revision_history(revid, marks.get_tip('master'))
|
||||
revno, revid = repo.last_revision_info()
|
||||
if peer:
|
||||
if hasattr(peer, "import_last_revision_info_and_tags"):
|
||||
peer.import_last_revision_info_and_tags(repo, revno, revid)
|
||||
else:
|
||||
peer.import_last_revision_info(repo.repository, revno, revid)
|
||||
try:
|
||||
repo.push(peer, stop_revision=revid)
|
||||
except bzrlib.errors.DivergedBranches:
|
||||
print "error %s non-fast forward" % ref
|
||||
continue
|
||||
else:
|
||||
wt = repo.bzrdir.open_workingtree()
|
||||
wt.update()
|
||||
|
Loading…
Reference in New Issue
Block a user