summaryrefslogtreecommitdiff
path: root/tests.branching
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-01-28 14:57:39 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-13 15:20:02 +0000
commitb7f69986034afef8a792839fac601caa0f20d55a (patch)
tree1ff1f9b9b02ee0e68f54ab91dbf6203cc31ebd8c /tests.branching
parent79a6f05bbf70a4fa10b1b426ef9f223d5cbaf3ee (diff)
downloadmorph-b7f69986034afef8a792839fac601caa0f20d55a.tar.gz
Remove features used by old bootstrap method
That means that bootstrapping Baserock is currently not possible with this branch of Morph, but there's no reason it cannot be bootstrapped using an older version of Morph instead.
Diffstat (limited to 'tests.branching')
-rwxr-xr-xtests.branching/setup3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests.branching/setup b/tests.branching/setup
index c0dfd969..1fa5b8e3 100755
--- a/tests.branching/setup
+++ b/tests.branching/setup
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (C) 2012 Codethink Limited
+# Copyright (C) 2012-2013 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@ cat <<EOF > "$DATADIR/morph.conf"
repo-alias = test=file://$DATADIR/%s#file://$DATADIR/%s
cachedir = $DATADIR/workspace/.morph/cache
log = $DATADIR/morph.log
-keep-path = true
no-distcc = true
quiet = true
EOF