blob: d73e483505037b6513210924a925fd37c98b2f34 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
#!/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
|
