Junio C Hamano 2210100ac0 [PATCH] Fix rename/copy when dealing with temporarily broken pairs. ...

When rename/copy uses a file that was broken by diffcore-break
as the source, and the broken filepair gets merged back later,
the output was mislabeled as a rename.  In this case, the source
file ends up staying in the output, so we should label it as a
copy instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2005-06-12 20:40:19 -07:00

11 KiB

Raw Blame History

View Raw