diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-29 16:02:42 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-29 18:19:26 +0000 |
commit | 1342bf9006f28a08d1b32dc8218717ebda701dc2 (patch) | |
tree | 0872d902b6ad4af6c4e238a28bc0c01624c62e0b /tests.branching/merge.script | |
parent | 9e4159ba97862c78a9cfa3e3816f18c708ccba5e (diff) | |
download | morph-1342bf9006f28a08d1b32dc8218717ebda701dc2.tar.gz |
Split merge tests out from the other branching tests
Merge is by far the most complex of the branching and merging commands.
Diffstat (limited to 'tests.branching/merge.script')
-rwxr-xr-x | tests.branching/merge.script | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/tests.branching/merge.script b/tests.branching/merge.script deleted file mode 100755 index d73e4835..00000000 --- a/tests.branching/merge.script +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# Copyright (C) 2012 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# Check that "morph merge" merges a system branch into master - -set -eu - -# Disable test on versions of Python before 2.7. -if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null -then - cat "$SRCDIR/tests.branching/merge.stdout" - exit 0 -fi - -# Create system branch. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs baserock/newbranch - -# Make a change to a chunk. -cd baserock/newbranch -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -cd baserock:hello -touch newfile.txt -git add newfile.txt -git commit -m foo --quiet -git push --quiet origin baserock/newbranch - -# Commit in morphs repo -cd ../baserock:morphs -git commit --all --quiet -m "Update morph refs for baserock/newbranch" - -# Merge changes back to master -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master -cd master -"$SRCDIR/scripts/test-morph" merge baserock/newbranch - -# Check results. -cd baserock:hello -git status --short # make sure all changes are committed -[ -e newfile.txt ] # make sure the new file is there - -# Make sure all refs to the merged branch have gone. -cd ../baserock:morphs -! grep "\"ref\": \"baserock/newbranch\"" *.morph - -# The only change here was the branch refs, which have now been -# changed back - so there should not be any new commits. -echo "Commit message for baserock:morphs" -git cat-file commit HEAD | tail -n 1 - -echo -echo "Commit message for baserock:hello" -cd ../baserock:hello -git cat-file commit HEAD | tail -n 1 |