development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fc/remote-bzr'

Browse source 
* fc/remote-bzr:
  remote-bzr: use proper push method
This commit is contained in:
Junio C Hamano 2013-04-26 15:18:26 -07:00
parent aedb94b3f0 fbd3f0e53c
commit df8597258e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
contrib/remote-helpers/git-remote-bzr
View file

@ -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()