From: Felipe Contreras Date: Tue, 14 May 2013 04:37:10 GMT Subject: [PATCH 47/47] remote-hg: remove files before modifications Message-ID: <1368506230-19614-48-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1368506230-19614-1-git-send-email-felipe.contreras@gmail.com> Otherwise replacing a file with a directory doesn't work. Signed-off-by: Felipe Contreras --- 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 24100df..6c7439e 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -491,10 +491,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.rc1.579.g184e698