From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 25 May 2013 02:29:57 +0000 (-0500)
Subject: remote-hg: remove files before modifications
X-Git-Tag: v1.8.4-rc0~191^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66f46aa14fa48e5d17885b46e80250e155c255e3;p=thirdparty%2Fgit.git

remote-hg: remove files before modifications

Otherwise replacing a file with a directory doesn't work.

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-hg b/contrib/remote-helpers/git-remote-hg
index fa76b3f610..bd545aa380 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -510,10 +510,10 @@ def export_ref(repo, name, kind, head):
             if len(parents) > 1:
                 print "merge :%s" % (rev_to_mark(parents[1]))
 
-        for f in modified_final:
-            print "M %s :%u %s" % f
         for f in removed:
             print "D %s" % (fix_file_path(f))
+        for f in modified_final:
+            print "M %s :%u %s" % f
         print
 
         progress = (rev - tip)