[PATCH v2 41/48] remote-hg: remove files before modifications

From

Felipe Contreras <felipe.contreras@gmail.com>

Date

May 25, 2013, 02:29 UTC

Message-ID

<1369449004-17981-42-git-send-email-felipe.contreras@gmail.com>

In-Reply-To

<1369449004-17981-1-git-send-email-felipe.contreras@gmail.com>

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

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/remote-helpers/git-remote-hg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index fa76b3f..bd545aa 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)

-- 
1.8.3.rc3.312.g47657de