undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-hg: remove files before modifications

Browse Source 
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>
This commit is contained in:
Felipe Contreras 2013-05-24 21:29:57 -05:00 committed by Junio C Hamano
parent d462469b4d
commit 66f46aa14f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/remote-helpers/git-remote-hg
View File

@ -510,10 +510,10 @@ def export_ref(repo, name, kind, head):
if len(parents) > 1: if len(parents) > 1:
print "merge :%s" % (rev_to_mark(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: for f in removed:
print "D %s" % (fix_file_path(f)) print "D %s" % (fix_file_path(f))
for f in modified_final:
print "M %s :%u %s" % f
print print
progress = (rev - tip) progress = (rev - tip)