diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-19 13:09:39 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-19 13:28:19 +0000 |
| commit | 7f25c6bea678eb82fdfe024013dac5d0c01af152 (patch) | |
| tree | 5d6aaed1754a2392e35a8f548171f4757584c77f /tests.branching/add-then-edit.script | |
| parent | 754200f3b2bf79d5327b3926e04a8f4136dc035e (diff) | |
| download | morph-7f25c6bea678eb82fdfe024013dac5d0c01af152.tar.gz | |
Use new edit instead of old one in tests
The test suite got adapted so it requires the new edit instead of the
old one. So use the new edit instead of the old one in the test.
This is a kluge, and needs to be reverted after the BR10 release.
Diffstat (limited to 'tests.branching/add-then-edit.script')
| -rwxr-xr-x | tests.branching/add-then-edit.script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/add-then-edit.script b/tests.branching/add-then-edit.script index d6a2270f..cdb28fd2 100755 --- a/tests.branching/add-then-edit.script +++ b/tests.branching/add-then-edit.script @@ -30,7 +30,7 @@ cd "me/add-then-edit" cd test:morphs ## Sub-optimally, to alter the stratum, you have to `morph edit` it first -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum git apply <<'EOF' diff --git a/hello-stratum.morph b/hello-stratum.morph @@ -50,7 +50,7 @@ index 3b7be17..c79a9af 100644 name: hello-stratum EOF -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum goodbye +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum goodbye # check whether the stratum still contains the goodbye chunk grep -qFe goodbye hello-stratum.morph |