diff options
Diffstat (limited to 'tests.branching/merge-explicitly-named-repos.script')
| -rwxr-xr-x | tests.branching/merge-explicitly-named-repos.script | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests.branching/merge-explicitly-named-repos.script b/tests.branching/merge-explicitly-named-repos.script index 5a0953a7..ad3ef0e6 100755 --- a/tests.branching/merge-explicitly-named-repos.script +++ b/tests.branching/merge-explicitly-named-repos.script @@ -24,25 +24,24 @@ set -eu # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch newbranch +"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch # Make a change to a chunk. -cd newbranch/morphs "$SRCDIR/scripts/test-morph" edit baserock:hello master -cd ../baserock:hello +cd newbranch/baserock:hello touch newfile.txt git add newfile.txt git commit -m foo --quiet # Merge changes to a new system branch. cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" branch otherbranch -cd otherbranch/morphs +"$SRCDIR/scripts/test-morph" branch baserock:morphs otherbranch +cd otherbranch "$SRCDIR/scripts/test-morph" edit baserock:hello master "$SRCDIR/scripts/test-morph" merge newbranch baserock:hello # Check results. -cd ../baserock:hello +cd baserock:hello git status --short # make sure all changes are committed ls newfile.txt # make sure the new file is there |