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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix merge tests on Squeeze, by disabling them correctly	Sam Thursfield	2012-09-27	4	-1/+18
*	Rename arm to armv7 and be consistent	Richard Maw	2012-09-27	4	-6/+6
*	Merge remote-tracking branch 'origin/samthursfield/merge-conflicts'	Lars Wirzenius	2012-09-26	9	-65/+363
\|\
\| *	Add merge conflict tests	Sam Thursfield	2012-09-25	8	-0/+239
\| *	morph merge: Clean up on failure	Sam Thursfield	2012-09-25	1	-50/+72
\| *	morph merge: Handle merge conflicts more helpfully	Sam Thursfield	2012-09-25	1	-9/+35
\| *	morph merge: Consolidate more functionality in merge_repo()	Sam Thursfield	2012-09-25	1	-29/+33
\| *	morph merge: Always pull --no-commit, so we can roll back more easily	Sam Thursfield	2012-09-25	1	-11/+12
\| *	morph merge: Better errors from checkout_repository()	Sam Thursfield	2012-09-25	1	-2/+8
* \|	Fix up run-bootstrap-in-chroot for tarball fix	Daniel Silverstone	2012-09-26	1	-1/+1
\|/
*	Merge remote-tracking branch 'origin/danielsilverstone/tarballs-instead-of-bu...	Daniel Silverstone	2012-09-25	10	-54/+88
\|\
\| *	Use tarballs instead of bundles	Daniel Silverstone	2012-09-25	10	-54/+88
* \|	Catch URLError so that missing cache-servers don't cause morph to die.	Daniel Silverstone	2012-09-25	1	-1/+1
\|/
*	Merge branch 'master' of git://git.baserock.org/baserock/morph	Lars Wirzenius	2012-09-25	1	-3/+13
\|\
\| *	Default bundle-server and cache-server based on trove-host.	Daniel Silverstone	2012-09-25	1	-3/+13
* \|	Give Morph a version number	Lars Wirzenius	2012-09-25	2	-1/+4
\|/
*	Merge remote-tracking branch 'origin/samthursfield/S4905-edit-chunk-morpholog...	Lars Wirzenius	2012-09-24	1	-1/+1
\|\
\| *	Lookup chunks within strata by 'morph' field, not 'name'	Sam Thursfield	2012-09-24	1	-1/+1
\|/
*	Merge remote-tracking branch 'origin/samthursfield/S4715-update-status-when-c...	Lars Wirzenius	2012-09-24	1	-1/+1
\|\
\| *	morph branch, checkout, edit: Print message when updating git cache	Sam Thursfield	2012-09-24	1	-0/+2
* \|	Merge branch 'samthursfield/S4845-fix-tests-on-squeeze'	Lars Wirzenius	2012-09-24	6	-1/+30
\|\ \ \| \|/ \|/\|
\| *	Disable tests on Debian Squeeze that require Python 2.7	Sam Thursfield	2012-09-24	5	-1/+28
\| *	morph edit: Print message when updating local cache	Sam Thursfield	2012-09-24	1	-0/+2
\|/
*	Merge branch 'baserock/radiofree/check_mtime'	Lars Wirzenius	2012-09-24	1	-0/+15
\|\
\| *	Small coding standards/message fixes	James Thomas	2012-09-21	1	-2/+2
\| *	Check the mtime of the app.py to make sure it is not in the future	James Thomas	2012-09-21	1	-0/+15
* \|	Merge branch 'samthursfield/S4679-morph-petrify' of git://git.baserock.org/ba...	Richard Maw	2012-09-21	10	-195/+581
\|\ \ \| \|/ \|/\|
\| *	Test that 'petrify' is safe against multiple invocations	Sam Thursfield	2012-09-21	2	-0/+54
\| *	Add petrify/unpetrify workflow test	Sam Thursfield	2012-09-21	4	-112/+355
\| *	morph edit: unpetrify before editing, if need be	Sam Thursfield	2012-09-21	1	-0/+4
\| *	morph petrify: Handle strata in external repos	Sam Thursfield	2012-09-21	1	-49/+52
\| *	Add 'morph unpetrify'	Sam Thursfield	2012-09-21	3	-0/+65
\| *	morph petrify: Rewrite in the style of today	Sam Thursfield	2012-09-21	4	-39/+56
\| *	morph foreach: Fix with cliapp < 1.20120630	Sam Thursfield	2012-09-21	2	-10/+6
\| *	Always cache artifacts locally and report filenames during build.	Daniel Silverstone	2012-09-21	1	-0/+7
\| *	Add .artifact_filename() to external API of LocalArtifactCache	Daniel Silverstone	2012-09-21	2	-4/+13
* \|	Merge branch 'samthursfield/misc-2' of git://git.baserock.org/baserock/morph	Richard Maw	2012-09-21	1	-4/+18
\|\ \
\| * \|	Give better error when reading a morphology file fails	Sam Thursfield	2012-09-21	1	-4/+9
\| * \|	Warn when we edit morphologies where filename != name	Sam Thursfield	2012-09-21	1	-0/+4
\| * \|	morph foreach: Mention -- in docstring	Sam Thursfield	2012-09-21	1	-0/+5
\|/ /
* \|	Merge remote branch 'origin/samthursfield/S4872-fix-foreach-errors'	Lars Wirzenius	2012-09-21	2	-10/+6
\|\ \
\| * \|	morph foreach: Fix with cliapp < 1.20120630	Sam Thursfield	2012-09-21	2	-10/+6
* \| \|	Merge branch 'master' of git://git.baserock.org/baserock/morph	Lars Wirzenius	2012-09-21	3	-4/+20
\|\ \ \
\| * \ \	Merge branch 'danielsilverstone/report-artifact-name' of git://git.baserock.o...	Richard Maw	2012-09-21	3	-4/+20
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Always cache artifacts locally and report filenames during build.	Daniel Silverstone	2012-09-21	1	-0/+7
\| \| * \|	Add .artifact_filename() to external API of LocalArtifactCache	Daniel Silverstone	2012-09-21	2	-4/+13
\| \|/ /
* \| \|	Merge remote branch 'origin/danielsilverstone/log-bundle-download'	Lars Wirzenius	2012-09-21	1	-11/+18
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Refactor _fetch() and log bundle fetches.	Daniel Silverstone	2012-09-21	1	-11/+18
\|/
*	morph foreach: Use self.app.output.write(), not print	Sam Thursfield	2012-09-18	1	-2/+2
*	Merge branch 'samthursfield/S4717-morph-foreach' of git://git.baserock.org/ba...	Richard Maw	2012-09-18	9	-31/+102
\|\