Browse Source

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>
maint
Felipe Contreras 12 years ago committed by Junio C Hamano
parent
commit
66f46aa14f
  1. 4
      contrib/remote-helpers/git-remote-hg

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

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

Loading…
Cancel
Save