OSDN Git Service

remote-bzr: remove files before modifications
authorChristophe Simonis <christophe@kn.gl>
Sat, 6 Apr 2013 03:49:18 +0000 (21:49 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Apr 2013 07:39:26 +0000 (00:39 -0700)
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>
contrib/remote-helpers/git-remote-bzr

index a7d041b..f818e93 100755 (executable)
@@ -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