blob: 405e6c88660f2119522799f4eb1bd0c2a8e1c8a6 (
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
|
#!/bin/sh
#
# Copyright (C) 2012-2014 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.
## "morph merge" should detect changes in a repo that was added as part of the
## branch and warn the user that the changes will not be merged automatically
set -eu
# Create system branch.
cd "$DATADIR/workspace"
"$SRCDIR/scripts/test-morph" init
"$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch
"$SRCDIR/scripts/test-morph" edit hello
# Chunk moves to a new location (we manually update the ref back to master
# here, so 'morph edit' can create a system branch in the new repo from it).
git clone -q "$DATADIR/hello" "$DATADIR/hello-lorried"
cd "$DATADIR/workspace/baserock/newbranch/test:morphs"
sed -e 's/"repo": "test:hello"/"repo": "test:hello-lorried"/' \
-e 's/"ref": "baserock\/newbranch"/"ref": "master"/' \
-i hello-stratum.morph
git commit -q --all -m "'hello' repository has moved"
# Now we further edit the chunk, just for fun.
"$SRCDIR/scripts/test-morph" edit hello
cd "$DATADIR/workspace/baserock/newbranch/test:hello-lorried"
touch newfile.txt
git add newfile.txt
git commit -m "Add new file" --quiet
cd "$DATADIR/workspace/baserock/newbranch/test:morphs"
git commit -q --all -m "Update system branch refs"
# Try to merge changes back to master (should fail, because we don't support
# adding chunks inside branches yet).
cd "$DATADIR/workspace"
"$SRCDIR/scripts/test-morph" checkout test:morphs master
cd master
"$SRCDIR/scripts/test-morph" merge baserock/newbranch
|
