summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add rudimentary branch+merge supportLars Wirzenius2012-03-2646-127/+1432
|\
| * Add test script to test the whole branch+merge processLars Wirzenius2012-03-261-0/+39
| * Change "checkout existing branch" test to not check out masterLars Wirzenius2012-03-265-14/+34
| * Fix "morph checkout" and system branch deductionLars Wirzenius2012-03-261-5/+15
| * Do not create a cache directory in the mineLars Wirzenius2012-03-264-4/+0
| * Run tests.branching tests with checkLars Wirzenius2012-03-231-0/+1
| * Make "morph edit" work with existing branches, and fix "morph merge" pulling ...Lars Wirzenius2012-03-231-2/+5
| * Normalize output of show-dependencies testLars Wirzenius2012-03-232-124/+124
| * Verify that "morph edit" checks out a working treeLars Wirzenius2012-03-232-0/+4
| * Fix expected output to match current test outputLars Wirzenius2012-03-231-1/+1
| * Make "morph edit" work when chunk already has the branchLars Wirzenius2012-03-233-2/+46
| * Modify "morph edit" test to verify origin is set correctlyLars Wirzenius2012-03-232-0/+30
| * Add cmdtest for morph branch to set origin correctlyLars Wirzenius2012-03-234-1/+23
| * Add helper script for cleaning up test outputLars Wirzenius2012-03-233-14/+43
| * Add "morph checkout" commandLars Wirzenius2012-03-233-0/+62
| * Add "morph merge" subcommandLars Wirzenius2012-03-234-2/+69
| * Add "morph edit", "morph show-system-branch" subcommandsLars Wirzenius2012-03-235-17/+142
| * Implement "morph branch"Lars Wirzenius2012-03-223-2/+67
| * Create a morph config file in the test setup scriptLars Wirzenius2012-03-221-0/+12
| * Add test for "morph branch" when system branch directory already existsLars Wirzenius2012-03-224-0/+39
| * Create dummy git repositories for morphs, helloLars Wirzenius2012-03-222-0/+80
| * Add test case for minedir when a minedir is not in the ancestorsLars Wirzenius2012-03-223-0/+21
| * Implement the "morph mine" subcommandLars Wirzenius2012-03-222-0/+14
| * Add test for "morph minedir"Lars Wirzenius2012-03-221-0/+20
| * Implement "morph init" and fix tests accordinglyLars Wirzenius2012-03-2212-8/+60
| * Filter out $DESTDIR from morph outputLars Wirzenius2012-03-221-2/+20
| * Fix tree listing to include path for each nameLars Wirzenius2012-03-221-1/+1
| * Add test cases for "morph init"Lars Wirzenius2012-03-229-0/+147
| * Add testing helper for listing contents of directory treesLars Wirzenius2012-03-221-0/+25
| * Add helper script for cmdtest scripts to run morph withLars Wirzenius2012-03-221-0/+21
| * Add documentation for branching and mergingLars Wirzenius2012-03-221-0/+339
* | Separate tests that need to be run as root in their own directoryLars Wirzenius2012-03-268-0/+171
* | Add test output of the make-patch test.Jannis Pohlmann2012-03-232-0/+19
* | make-patch test: fix path to hello binaryRichard Maw2012-03-231-1/+1
* | Fix the paths passed to tbdiff-create.Jannis Pohlmann2012-03-231-2/+2
* | make-patch test: dummy stratum has dummy boot infoRichard Maw2012-03-231-1/+34
* | fix morph wrapper to not falsely report successRichard Maw2012-03-231-1/+6
* | tests: add test for patch buildingRichard Maw2012-03-231-0/+53
* | Further fixes to get make-patch work.Jannis Pohlmann2012-03-231-8/+12
* | morph make patch: diff factory subvolumesRichard Maw2012-03-231-2/+3
* | Fix a few typos and so on.Jannis Pohlmann2012-03-232-8/+10
* | morphlib: allow import morphlib to find fsutilsRichard Maw2012-03-231-0/+1
* | fix overly long linesRichard Maw2012-03-232-8/+12
* | morph: add make_patch commandRichard Maw2012-03-232-0/+41
* | morphlib: move filesystem stuff out of builderRichard Maw2012-03-232-39/+78
* | make get_cache_id not require a blob to be passedRichard Maw2012-03-231-15/+13
* | Merge branch 'master' into jannis/create-systems-with-btrfsJannis Pohlmann2012-03-2213-93/+82
|\ \ | |/
| * use "set -eu" in scriptsLars Wirzenius2012-03-229-9/+9
| * Remove unused variableLars Wirzenius2012-03-221-1/+0
| * Simplify by removing unnecessary variablesLars Wirzenius2012-03-221-4/+1