From b4087654e9e332b5d101b6be2c296f782c5e10eb Mon Sep 17 00:00:00 2001 From: Paul Sherwood Date: Sun, 8 Jun 2014 11:53:09 +0000 Subject: WIP fixups for tests with new morph syntax. ./check --full fails, though --- tests.merging/rename-chunk.script | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests.merging/rename-chunk.script') diff --git a/tests.merging/rename-chunk.script b/tests.merging/rename-chunk.script index 8c323798..ac63cdd7 100755 --- a/tests.merging/rename-chunk.script +++ b/tests.merging/rename-chunk.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# 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 @@ -27,7 +27,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch # Rename the chunk, and then commit a seperate change -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" edit hello cd baserock/newbranch/test:hello cat hello.morph | sed -e 's/"name": "hello"/"name": "goodbye"/' > goodbye.morph -- cgit v1.2.1