| commit | c81935348be263de3da085e6ac828b583a85c905 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 16 Mar 2007 06:25:22 +0000 (15 23:25 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 4 Apr 2007 07:25:10 +0000 (4 00:25 -0700) | ||
| tree | 0cba3a90230a1df1f01f6c0a4b32f66e92477321 | treesnapshot (tar.gz zip) |
| parent | b8ba1535bda7bd553f46ea57bdbcee1c90e500a0 | commitdiff |
Fix switching to a branch with D/F when current branch has file D.
This loosens the over-eager verify_absent() check that gets
upset to find directory D in the current working tree when
switching to a branch that has a file there. The check needs to
make sure that we do not lose precious working tree files as a
result of removing directory D and replacing it with the file
from the other branch, which is a tad expensive but this is a
less common case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This loosens the over-eager verify_absent() check that gets
upset to find directory D in the current working tree when
switching to a branch that has a file there. The check needs to
make sure that we do not lose precious working tree files as a
result of removing directory D and replacing it with the file
from the other branch, which is a tad expensive but this is a
less common case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| unpack-trees.c | diffblobblamehistory |