8 Commits

Author	SHA1	Message	Date
Matt Mackall	dea868ff61	cmdutil: simplify duplicatecopies	2012-01-05 20:35:10 -06:00
Martin Geisler	ae8ca6aff5	merge: make debug output easier to read ... I always found it hard to figure out what the debug code meant without the separators.	2011-12-09 17:34:53 +01:00
Matt Mackall	75db0d196a	merge with stable	2011-11-17 16:53:17 -06:00
Stefano Tortarolo	f195f71994	graft: disallow grafting grafted csets in specific situations (issue3091) ... In particular, we do not allow: - grafting an already grafted cset onto its original branch - grafting already grafted csets with the same origin onto each other	2011-11-12 14:00:25 +01:00
Stefano Tortarolo	2dbc061389	graft: use revs to make tests more readable	2011-11-12 11:23:52 +01:00
Stefano Tortarolo	dfee711e26	graft: preserve original source in subsequent grafts	2011-11-12 13:15:40 +01:00
Matt Mackall	66de5cde16	merge: give a special message for internal:merge failure (issue3105)	2011-11-16 18:04:19 -06:00
Matt Mackall	3c5a04f076	graft: add a test	2011-10-24 17:01:49 -05:00