baserock/baserock/morph.git - Morph -- Baserock build tool

	Commit message (Collapse)	Author	Age	Files	Lines
*	Disable tests on Debian Squeeze that require Python 2.7	Sam Thursfield	2012-09-24	1	-0/+7
\| \| \| \| \|	Our non-destructive morphology editing requires at least Python 2.7, which is not available on Squeeze.
*	tests.branching: Add complex merge tests	Sam Thursfield	2012-09-17	1	-0/+51
	* Spot completely unmergable cases * Make sure that changes in a chunk repo are merged to the back to that chunk's original ref, which is not necessarily the same as the TO system branch. * Test renaming a chunk (works fine if repo is the same) * Try adding a new chunk or stratum and editing it too.