From: Felipe Contreras Date: Mon, 08 Apr 2013 17:27:11 GMT Subject: [PATCH v2 2/7] remote-bzr: remove files before modifications Message-ID: <1365442036-25732-3-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1365442036-25732-1-git-send-email-felipe.contreras@gmail.com> From: Christophe Simonis Allow re-add of a deleted file in the same commit. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index a7d041b..f818e93 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 -- 1.8.2