| commit | 65aadb92a1ce9605fa2f412b51de91781a3ef3d6 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 24 May 2006 20:19:50 +0000 (24 13:19 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 24 May 2006 20:23:31 +0000 (24 13:23 -0700) | ||
| tree | 7ca4a1797979027fb27a10375d5d9f048d812015 | treesnapshot (tar.gz zip) |
| parent | cc189c2ca2c725c430f100f61e7c4a6849f93163 | commitdiff |
apply: force matching at the beginning.
When there is no leading context, the patch must match at the
beginning of preimage; otherwise there is a "patch adds these
lines while the other lines were added to the original file"
conflict.
This is the opposite of match_end fix earlier in this series.
Unlike matching at the end case, we can additionally check the
preimage line number recorded in the patch, so the change is not
symmetrical with the earlier one.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When there is no leading context, the patch must match at the
beginning of preimage; otherwise there is a "patch adds these
lines while the other lines were added to the original file"
conflict.
This is the opposite of match_end fix earlier in this series.
Unlike matching at the end case, we can additionally check the
preimage line number recorded in the patch, so the change is not
symmetrical with the earlier one.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| apply.c | diffblobblamehistory | |
| t/t4113-apply-ending.sh | diffblobblamehistory |