4 Commits

Author	SHA1	Message	Date
Matt Mackall	06d5fbf2a5	copy: handle rename internally ... - add rename parameter - don't collect copied list - report "moving" rather than "copying" - remove renamed files - don't return copied list - simplify callers	2007-12-07 02:29:55 -06:00
Matt Mackall	6bf7f7256d	merge: fix spurious merges for copies in linear updates ... We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.	2007-05-08 02:59:13 -05:00
Matt Mackall	ebc2b5ccc8	merge: fix a bug where copies were ignored	2007-04-05 16:43:18 -05:00
Matt Mackall	4458a1780a	merge: fix renaming of subdirectories under renamed directories	2007-02-27 16:20:06 -06:00