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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix spelling mistakes	Sam Thursfield	2012-11-12	4	-6/+6
*	Merge branch 'samthursfield/stable-merge'	Sam Thursfield	2012-11-05	1	-1/+1
\|\
\| *	Process systems for merging in a fixed order	Sam Thursfield	2012-11-05	1	-1/+1
\|/
*	Merge remote-tracking branch 'origin/samthursfield/fix-load-morphology-bug'	Lars Wirzenius	2012-11-02	1	-0/+1
\|\
\| *	Fix use of variable before assignment	Sam Thursfield	2012-11-02	1	-0/+1
\|/
*	Fix mistake in renaming tests that breaks ./check on Squeeze	Sam Thursfield	2012-10-31	3	-4/+4
*	Merge remote-tracking branch 'remotes/origin/baserock/richardmaw/allow-smalle...	Lars Wirzenius	2012-10-31	2	-2/+8
\|\
\| *	Add and use sparse-gunzip in loopback-rootfs	Richard Maw	2012-10-26	2	-2/+8
* \|	Merge branch 'master' of git://git.baserock.org/baserock/morph	Lars Wirzenius	2012-10-31	1	-0/+22
\|\ \
\| * \|	Add missing teardown script to tests.merging	Sam Thursfield	2012-10-31	1	-0/+22
* \| \|	Merge remote-tracking branch 'remotes/origin/samthursfield/update-help'	Lars Wirzenius	2012-10-31	8	-162/+121
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Set option group for some advanced settings	Sam Thursfield	2012-10-31	2	-21/+38
\| * \|	Improve command descriptions in --help	Sam Thursfield	2012-10-26	5	-47/+31
\| * \|	Remove hello-plugin	Sam Thursfield	2012-10-26	1	-29/+0
\| * \|	Reduce some option descriptions	Sam Thursfield	2012-10-26	1	-27/+13
\| * \|	Reorder settings by broad category	Sam Thursfield	2012-10-26	1	-58/+59
* \| \|	Split merge tests out from the other branching tests	Sam Thursfield	2012-10-29	30	-77/+141
\| \|/ \|/\|
* \|	Simplify checkout-non-aliased-repos test	Richard Maw	2012-10-26	2	-44/+2
* \|	Merge branch 'samthursfield/write-etc-os-release' of git://git.baserock.org/b...	Richard Maw	2012-10-26	7	-1/+25
\|\ \ \| \|/ \|/\|
\| *	Write /etc/os-release in system images	Sam Thursfield	2012-10-26	7	-1/+25
\|/
*	Merge branch 'samthursfield/write-metadata-for-system' of git://git.baserock....	Richard Maw	2012-10-26	12	-41/+165
\|\
\| *	Write metadata for the rootfs itself into the rootfs	Sam Thursfield	2012-10-26	12	-41/+165
\|/
*	Merge branch 'samthursfield/morph-status-in-workspace-sorted'	Sam Thursfield	2012-10-18	2	-3/+4
\|\
\| *	morph status: Sort list of system branches in a workspace	Sam Thursfield	2012-10-18	2	-3/+4
* \|	Merge branch 'samthursfield/petrify-avoid-edited-chunks' of git://git.baseroc...	Richard Maw	2012-10-18	5	-23/+130
\|\ \ \| \|/ \|/\|
\| *	morph petrify: Avoid petrifying chunks that have already been edited	Sam Thursfield	2012-10-18	5	-23/+130
\|/
*	Merge branch 'samthursfield/morph-status'	Lars Wirzenius	2012-10-12	7	-33/+208
\|\
\| *	morph status, foreach: Find root repo in correct way	Sam Thursfield	2012-10-12	1	-5/+8
\| *	Factor out common function iterate_branch_repos()	Sam Thursfield	2012-10-12	1	-10/+14
\| *	morph status: Add initial version of command	Sam Thursfield	2012-10-12	7	-0/+163
\| *	Reorder branch and merge plumbing commands to end of file	Sam Thursfield	2012-10-12	1	-25/+30
\|/
*	Merge remote-tracking branch 'origin/liw/fix-check-on-squeeze'	Daniel Silverstone	2012-10-12	4	-6/+16
\|\
\| *	Disable two tests if Python 2.6 is being used	Lars Wirzenius	2012-10-12	2	-0/+8
\| *	Use . instead of source in /bin/sh script	Lars Wirzenius	2012-10-12	1	-1/+1
\| *	Fix use of GzipFile to not assume "with" protocol	Lars Wirzenius	2012-10-12	2	-5/+7
\|/
*	Merge remote-tracking branch 'origin/samthursfield/S4873-warn-when-merge-caus...	Daniel Silverstone	2012-10-11	5	-9/+119
\|\
\| *	Add test for petrify warning	Sam Thursfield	2012-10-11	2	-0/+33
\| *	morph merge: Warn if a merge will cause unexpected petrification	Sam Thursfield	2012-10-11	2	-9/+84
\| *	Fix test that should have been doing 'morph edit'	Sam Thursfield	2012-10-11	1	-0/+2
* \|	Merge remote-tracking branch 'origin/liw/morphology-validation'	Sam Thursfield	2012-10-11	2	-1/+117
\|\ \ \| \|/ \|/\|
\| *	Validate that systems, strata reference correct kinds	Lars Wirzenius	2012-10-11	1	-0/+43
\| *	Warn about unknown morphology fields	Lars Wirzenius	2012-10-11	1	-0/+32
\| *	Add morphology validation to branch+merge	Lars Wirzenius	2012-10-11	1	-0/+35
\| *	Handle ValueErrors from JSON library	Lars Wirzenius	2012-10-11	1	-1/+7
\|/
*	Merge branch 'samthursfield/S5211-fix-foreach-with-full-uris'	Sam Thursfield	2012-10-11	3	-3/+35
\|\
\| *	morph foreach: Handle repos addressed by full URLs correctly	Sam Thursfield	2012-10-10	3	-3/+35
\|/
*	Merge branch 'baserock/richardmaw/S5182/fix-link-paths' of git://git.baserock...	Richard Maw	2012-10-09	5	-13/+148
\|\
\| *	Add regression test for created tarballs	Richard Maw	2012-10-09	3	-0/+140
\| *	Make hardlink paths relative	Richard Maw	2012-10-09	1	-0/+3
\| *	Use os.path.relpath for fixing paths in tarball system builder	Richard Maw	2012-10-09	1	-4/+2