9 Commits

Author	SHA1	Message	Date
Dirkjan Ochtman	3e3b0d62eb	warn about new heads on commit (issue842)	2008-03-21 11:06:02 +01:00
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	3c8b7b8583	rename: add test for moving untracked files in directories	2007-12-01 12:54:34 -06:00
Matt Mackall	3f58de820d	merge: add debug diagnostics for findcopies	2007-10-04 19:44:37 -05:00
Alexis S. L. Carvalho	4bb4d97472	correctly record file-level history when the local side renames a directory	2007-08-27 14:21:04 -03: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
Thomas Arendsen Hein	ecaffdb830	Fix test-rename-dir-merge for different implementations of ls.	2006-12-01 15:40:23 +01:00
Matt Mackall	d664d787b4	Add missing test output	2006-11-30 19:50:28 -06:00