| commit | 7f95aef28fa1e2662aebb4556c71ad6912d395e5 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 17 Jul 2006 07:10:47 +0000 (17 00:10 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 17 Jul 2006 07:10:47 +0000 (17 00:10 -0700) | ||
| tree | 57fbcb9b99c40bdf75742df2e21637294998921c | treesnapshot (tar.gz zip) |
| parent | eed46644ca48ad08e1fd71e14afbe801399e8a67 | commitdiff |
apply: handle type-changing patch correctly.
A type-change diff is always split into a patch to delete old,
immediately followed by a patch to create new. check_patch()
routine noticed that the path to be created already exists in
the working tree and/or in the index when looking at the
creation patch and mistakenly thought it to be an error.
Signed-off-by: Junio C Hamano <junkio@cox.net>
A type-change diff is always split into a patch to delete old,
immediately followed by a patch to create new. check_patch()
routine noticed that the path to be created already exists in
the working tree and/or in the index when looking at the
creation patch and mistakenly thought it to be an error.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| builtin-apply.c | diffblobblamehistory |