summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/jonathanmaw/autotools-sysconfdir'Lars Wirzenius2012-11-081-1/+1
|\ \
| * | Set sysconfdir to /etc when morph builds an autotools projectJonathan Maw2012-11-081-1/+1
|/ /
* | Merge branch 'liw/expand-repo-plugin' of git://git.baserock.org/baserock/morphRichard Maw2012-11-082-0/+43
|\ \ | |/ |/|
| * Add plugin to without-test-modules listLars Wirzenius2012-11-071-0/+1
| * Add a morph helper subcommand for expanding aliased reposLars Wirzenius2012-11-071-0/+53
|/
* Merge branch 'samthursfield/stable-merge'Sam Thursfield2012-11-051-1/+1
|\
| * Process systems for merging in a fixed orderSam Thursfield2012-11-051-1/+1
|/
* Merge remote-tracking branch 'origin/samthursfield/fix-load-morphology-bug'Lars Wirzenius2012-11-021-0/+1
|\
| * Fix use of variable before assignmentSam Thursfield2012-11-021-0/+1
|/
* Fix mistake in renaming tests that breaks ./check on SqueezeSam Thursfield2012-10-313-4/+4
* Merge remote-tracking branch 'remotes/origin/baserock/richardmaw/allow-smalle...Lars Wirzenius2012-10-312-2/+8
|\
| * Add and use sparse-gunzip in loopback-rootfsRichard Maw2012-10-262-2/+8
* | Merge branch 'master' of git://git.baserock.org/baserock/morphLars Wirzenius2012-10-311-0/+22
|\ \
| * | Add missing teardown script to tests.mergingSam Thursfield2012-10-311-0/+22
* | | Merge remote-tracking branch 'remotes/origin/samthursfield/update-help'Lars Wirzenius2012-10-318-162/+121
|\ \ \ | |/ / |/| |
| * | Set option group for some advanced settingsSam Thursfield2012-10-312-21/+38
| * | Improve command descriptions in --helpSam Thursfield2012-10-265-47/+31
| * | Remove hello-pluginSam Thursfield2012-10-261-29/+0
| * | Reduce some option descriptionsSam Thursfield2012-10-261-27/+13
| * | Reorder settings by broad categorySam Thursfield2012-10-261-58/+59
* | | Split merge tests out from the other branching testsSam Thursfield2012-10-2930-77/+141
| |/ |/|
* | Simplify checkout-non-aliased-repos testRichard Maw2012-10-262-44/+2
* | Merge branch 'samthursfield/write-etc-os-release' of git://git.baserock.org/b...Richard Maw2012-10-267-1/+25
|\ \ | |/ |/|
| * Write /etc/os-release in system imagesSam Thursfield2012-10-267-1/+25
|/
* Merge branch 'samthursfield/write-metadata-for-system' of git://git.baserock....Richard Maw2012-10-2612-41/+165
|\
| * Write metadata for the rootfs itself into the rootfsSam Thursfield2012-10-2612-41/+165
|/
* Merge branch 'samthursfield/morph-status-in-workspace-sorted'Sam Thursfield2012-10-182-3/+4
|\
| * morph status: Sort list of system branches in a workspaceSam Thursfield2012-10-182-3/+4
* | Merge branch 'samthursfield/petrify-avoid-edited-chunks' of git://git.baseroc...Richard Maw2012-10-185-23/+130
|\ \ | |/ |/|
| * morph petrify: Avoid petrifying chunks that have already been editedSam Thursfield2012-10-185-23/+130
|/
* Merge branch 'samthursfield/morph-status'Lars Wirzenius2012-10-127-33/+208
|\
| * morph status, foreach: Find root repo in correct waySam Thursfield2012-10-121-5/+8
| * Factor out common function iterate_branch_repos()Sam Thursfield2012-10-121-10/+14
| * morph status: Add initial version of commandSam Thursfield2012-10-127-0/+163
| * Reorder branch and merge plumbing commands to end of fileSam Thursfield2012-10-121-25/+30
|/
* Merge remote-tracking branch 'origin/liw/fix-check-on-squeeze'Daniel Silverstone2012-10-124-6/+16
|\
| * Disable two tests if Python 2.6 is being usedLars Wirzenius2012-10-122-0/+8
| * Use . instead of source in /bin/sh scriptLars Wirzenius2012-10-121-1/+1
| * Fix use of GzipFile to not assume "with" protocolLars Wirzenius2012-10-122-5/+7
|/
* Merge remote-tracking branch 'origin/samthursfield/S4873-warn-when-merge-caus...Daniel Silverstone2012-10-115-9/+119
|\
| * Add test for petrify warningSam Thursfield2012-10-112-0/+33
| * morph merge: Warn if a merge will cause unexpected petrificationSam Thursfield2012-10-112-9/+84
| * Fix test that should have been doing 'morph edit'Sam Thursfield2012-10-111-0/+2
* | Merge remote-tracking branch 'origin/liw/morphology-validation'Sam Thursfield2012-10-112-1/+117
|\ \ | |/ |/|
| * Validate that systems, strata reference correct kindsLars Wirzenius2012-10-111-0/+43
| * Warn about unknown morphology fieldsLars Wirzenius2012-10-111-0/+32
| * Add morphology validation to branch+mergeLars Wirzenius2012-10-111-0/+35
| * Handle ValueErrors from JSON libraryLars Wirzenius2012-10-111-1/+7
|/
* Merge branch 'samthursfield/S5211-fix-foreach-with-full-uris'Sam Thursfield2012-10-113-3/+35
|\
| * morph foreach: Handle repos addressed by full URLs correctlySam Thursfield2012-10-103-3/+35
|/