From 051ed7f0753ac292964019bb00929380f98b2191 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 9 Jun 2014 13:51:38 +0000 Subject: 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 --- tests.deploy/setup-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests.deploy') 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" \ -- cgit v1.2.1