diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-24 21:29:57 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-28 08:02:23 -0700 |
| commit | 66f46aa14fa48e5d17885b46e80250e155c255e3 (patch) | |
| tree | cca1083309f235ea569702159e0fb374690f8546 /contrib/remote-helpers | |
| parent | remote-hg: improve lightweight tag author (diff) | |
| download | tgif-66f46aa14fa48e5d17885b46e80250e155c255e3.tar.xz | |
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>
Diffstat (limited to 'contrib/remote-helpers')
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 4 |
1 files changed, 2 insertions, 2 deletions
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) |