undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-bzr: always try to update the worktree

Browse Source 
And fail properly when we can't.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-04-30 20:09:56 -05:00 committed by Junio C Hamano
parent aa12a431f3
commit 715d64fe99
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/remote-helpers/git-remote-bzr
View File

@ -641,9 +641,13 @@ def do_export(parser):
except bzrlib.errors.DivergedBranches: except bzrlib.errors.DivergedBranches:
print "error %s non-fast forward" % ref print "error %s non-fast forward" % ref
continue continue
else:
try:
wt = repo.bzrdir.open_workingtree() wt = repo.bzrdir.open_workingtree()
wt.update() wt.update()
except bzrlib.errors.NoWorkingTree:
pass
print "ok %s" % ref print "ok %s" % ref
print print