diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-06-09 13:51:38 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-06-09 13:51:38 +0000 |
| commit | 051ed7f0753ac292964019bb00929380f98b2191 (patch) | |
| tree | 7e502b0a9abe2c736b9f8260a8e984fc91e20539 /tests.deploy | |
| parent | 21e00e2a8acdeb5a67fb3d1eded28a4a0bcbd94a (diff) | |
| download | morph-051ed7f0753ac292964019bb00929380f98b2191.tar.gz | |
Fix up before merge
- All tests now pass
- The odd case of chunks with the same name but different repo URLs now
correctly informs the user of the multiple checkouts that were done.
- Tidyups
Diffstat (limited to 'tests.deploy')
| -rw-r--r-- | tests.deploy/setup-build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.deploy/setup-build b/tests.deploy/setup-build index 0fc561f9..c6b24da5 100644 --- a/tests.deploy/setup-build +++ b/tests.deploy/setup-build @@ -23,7 +23,7 @@ source "$SRCDIR/scripts/fix-committer-info" cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch test:morphs branch1 -"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux +"$SRCDIR/scripts/test-morph" edit linux # Fix UUID's in the checked out repos to make build branch names deterministic git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ |