Skip to content

Commit

Permalink
remote-bzr: remove files before modifications
Browse files Browse the repository at this point in the history
Allow re-add of a deleted file in the same commit.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Christophe Simonis authored and Junio C Hamano committed Apr 7, 2013
1 parent 82447e3 commit bc51f7c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contrib/remote-helpers/git-remote-bzr
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,10 @@ def export_branch(branch, name):
else:
print "merge :%s" % m

for f in removed:
print "D %s" % (f,)
for f in modified_final:
print "M %s :%u %s" % f
for f in removed:
print "D %s" % (f)
print

count += 1
Expand Down

0 comments on commit bc51f7c

Please sign in to comment.