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>
Christophe Simonis committed
Apr 5, 2013 at 21:49 UTC
bc51f7c3e2858052dcf8774bcffa217415b457c2
1 file changed
+2
-2
contrib/remote-helpers/git-remote-bzr
+2
-2
@@ -303,10 +303,10 @@ def export_branch(branch, name):
303
else:
304
print "merge :%s" % m
305
306
+ for f in removed:
307
+ print "D %s" % (f,)
308
for f in modified_final:
309
print "M %s :%u %s" % f
308
- for f in removed:
309
- print "D %s" % (f)
310
print
311
312
count += 1