diff options
| author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-06-08 11:53:09 +0000 |
|---|---|---|
| committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-06-08 12:07:16 +0000 |
| commit | b4087654e9e332b5d101b6be2c296f782c5e10eb (patch) | |
| tree | f6571971e668ba8189d90bf9c433066248b6dca4 /tests.merging/conflict-chunks.script | |
| parent | 901e79ec9020bc810230625ba824321379f24b85 (diff) | |
| download | morph-baserock/ps/simple-edit-syntax.tar.gz | |
WIP fixups for tests with new morph syntax. ./check --full fails, thoughbaserock/ps/simple-edit-syntax
Diffstat (limited to 'tests.merging/conflict-chunks.script')
| -rwxr-xr-x | tests.merging/conflict-chunks.script | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script index 5a0c5f52..b0d118ee 100755 --- a/tests.merging/conflict-chunks.script +++ b/tests.merging/conflict-chunks.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 @@ -44,14 +44,12 @@ add_text_in_repo() { # Sow the seeds of conflict cd "$DATADIR/workspace/test/stable" -"$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello -"$SRCDIR/scripts/test-morph" edit hello-system stratum3 hello +"$SRCDIR/scripts/test-morph" edit hello add_text_in_repo "test:stratum2-hello" "xyzzy" add_text_in_repo "test:stratum3-hello" "xyzzy" cd "$DATADIR/workspace/test/feature" -"$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello -"$SRCDIR/scripts/test-morph" edit hello-system stratum3 hello +"$SRCDIR/scripts/test-morph" edit hello add_text_in_repo "test:stratum2-hello" "plugh" add_text_in_repo "test:stratum3-hello" "plover" |