diff options
| author |  Christophe Simonis <christophe@kn.gl> | 2013-04-05 21:49:18 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-07 00:39:26 -0700 |
| commit | bc51f7c3e2858052dcf8774bcffa217415b457c2 (patch) | |
| tree | df32ab08e70ed410db1bdc1c2a2f90d63d9f324f | |
| parent | remote-bzr: fix directory renaming (diff) | |
| download | tgif-bc51f7c3e2858052dcf8774bcffa217415b457c2.tar.xz | |
remote-bzr: remove files before modifications
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>
| -rwxr-xr-x | contrib/remote-helpers/git-remote-bzr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index a7d041baec..f818e93f11 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -303,10 +303,10 @@ def export_branch(branch, name): else: print "merge :%s" % m + for f in removed: + print "D %s" % (f,) for f in modified_final: print "M %s :%u %s" % f - for f in removed: - print "D %s" % (f) print count += 1 |