3 Commits

Author	SHA1	Message	Date
Patrick Mezard	56a4e737a8	Fix a corner case when committing a rename after a merge (issue1476)	2009-01-25 18:55:29 +01:00
Matt Mackall	e777df13c0	copy: simplify inner copy ... - save dirstate lookup and exists check - do all fs work inside a single dryrun clause - move unlinking into inner copy section - move target dir creation - eliminate undelete mess - fix a bug on mv a -> b -> a after merge	2007-12-07 02:01:13 -06:00
Patrick Mezard	d611888360	Test renaming files brought by merge second parent (issue 746)	2007-09-23 14:40:44 +02:00