From: Christophe Simonis <christophe@kn.gl>
Date: Sat, 6 Apr 2013 03:49:18 +0000 (-0600)
Subject: remote-bzr: remove files before modifications
X-Git-Tag: v1.8.3-rc0~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc51f7c3e2858052dcf8774bcffa217415b457c2;p=thirdparty%2Fgit.git

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>
---

diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index a7d041baec..f818e93f11 100755
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr
@@ -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