diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-08-30 13:49:33 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-08-30 13:49:33 +0100 |
commit | 15eef533406cee3811650f96897724b4fba5c18c (patch) | |
tree | 65ade50ceb174765f77b8f87bdac131b947ff52b /tests.branching/setup | |
parent | c510c12be2d32a8ab18f7350d8f2a708e74cfa4a (diff) | |
parent | 17e4c4c0bad5589dabf67156afdfe9dc4e8f218b (diff) | |
download | morph-15eef533406cee3811650f96897724b4fba5c18c.tar.gz |
Merge branch 'jannis/initial-branch-and-merge-work'
Conflicts:
morphlib/plugins/branch_and_merge_plugin.py
Diffstat (limited to 'tests.branching/setup')
-rwxr-xr-x | tests.branching/setup | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests.branching/setup b/tests.branching/setup index 126714a0..477dd00a 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -18,7 +18,7 @@ # Set up $DATADIR. # # - a morph.conf configuration file -# - an empty morph mine directory +# - an empty morph workspace directory # - a git repository called "morphs" for fake system, stratum morphologies # - a git repository calle "hello" for a dummy chunk @@ -41,7 +41,7 @@ GIT_COMMITTER_DATE="1343753514 +0000" cat <<EOF > "$DATADIR/morph.conf" [config] repo-alias = baserock=file://$DATADIR/%s#file://$DATADIR/%s -cachedir = $DATADIR/mine/.morph/cache +cachedir = $DATADIR/workspace/.morph/cache log = $DATADIR/morph.log keep-path = true no-distcc = true @@ -49,13 +49,16 @@ quiet = true EOF -# Create an empty directory to be used as a morph mine -mkdir "$DATADIR/mine" +# Create an empty directory to be used as a morph workspace +mkdir "$DATADIR/workspace" # Create a fake morphs repository mkdir "$DATADIR/morphs" +## Create a link to this repo that has a .git suffix +ln -s "$DATADIR/morphs" "$DATADIR/morphs.git" + cat <<EOF > "$DATADIR/morphs/hello-system.morph" { "name": "hello-system", |