summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Merge branch 'baserock/richardmaw/S5182/fix-link-paths' of git://git.baserock...Richard Maw2012-10-095-13/+148
|\
| * Add regression test for created tarballsRichard Maw2012-10-093-0/+140
| * Make hardlink paths relativeRichard Maw2012-10-091-0/+3
| * Use os.path.relpath for fixing paths in tarball system builderRichard Maw2012-10-091-4/+2
| * Use standard library function for relative pathsRichard Maw2012-10-091-9/+3
|/
* Merge branch 'danielsilverstone/fix-up-make-patch' of git://git.baserock.org/...Richard Maw2012-10-094-37/+120
|\
| * foldmeDaniel Silverstone2012-10-091-2/+7
| * Block second half of make-patch test.Daniel Silverstone2012-10-091-0/+14
| * Fix up make-patchDaniel Silverstone2012-10-091-34/+56
| * Add a sparse-aware (for writing) copyfileobj.Daniel Silverstone2012-10-091-0/+39
| * Correct a few long lines.Daniel Silverstone2012-10-091-3/+6
|/
* Merge branch 'danielsilverstone/compress-disk-images'Daniel Silverstone2012-10-081-29/+45
|\
| * Compress system disk imagesDaniel Silverstone2012-10-081-29/+45
* | Fix typoLars Wirzenius2012-10-081-1/+1
|/
* Merge branch 'master' of git://git.baserock.org/baserock/morphLars Wirzenius2012-10-082-1/+20
|\
| * Handle branch name kind changes more gracefully.Daniel Silverstone2012-10-081-1/+5
| * Merge branch 'danielsilverstone/tarball-rootfs-fix'Daniel Silverstone2012-10-051-0/+15
| |\
| | * Actually construct a tarball for the rootfs-tarball system kind.Daniel Silverstone2012-10-051-0/+15
* | | Change the time sanity checkLars Wirzenius2012-10-081-13/+6
|/ /
* | Merge branch 'liw/lac-clear'Lars Wirzenius2012-10-052-0/+26
|\ \ | |/ |/|