remote-bzr: remove files before modifications
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>
This commit is contained in:
parent
82447e3361
commit
bc51f7c3e2
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user