mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-bzr: remove files before modifications

Browse Source 
Allow re-add of a deleted file in the same commit.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christophe Simonis
2013-04-05 21:49:18 -06:00
committed by Junio C Hamano
parent 82447e3361
commit bc51f7c3e2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,10 +303,10 @@ def export_branch(branch, name):
else: else:
print "merge :%s" % m print "merge :%s" % m
for f in removed:
print "D %s" % (f,)
for f in modified_final: for f in modified_final:
print "M %s :%u %s" % f print "M %s :%u %s" % f
for f in removed:
print "D %s" % (f)
print print
count += 1 count += 1