3 commits

Author	SHA1	Message	Date
Elijah Newren	dd5685818b	Mark tests that use symlinks as needing SYMLINKS prerequisite ... Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-08-12 21:38:39 -07:00
Elijah Newren	5a2580d62f	merge_recursive: Fix renames across paths below D/F conflicts ... The rename logic in process_renames() handles renames and merging of file contents and then marks files as processed. However, there may be higher stage entries left in the index for other reasons (e.g., due to D/F conflicts). By checking for such cases and marking the entry as not processed, it allows process_entry() later to look at it and handle those higher stages. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-07-09 16:13:00 -07:00
Alexander Gladysh	f433f70547	Add a rename + D/F conflict testcase ... This is a simple testcase where both sides of the rename are paths involved in (separate) D/F merge conflicts Signed-off-by: Alexander Gladysh <agladysh@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-07-09 16:11:13 -07:00