diff options
Diffstat (limited to 'tests.branching/merge.script')
| -rwxr-xr-x | tests.branching/merge.script | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests.branching/merge.script b/tests.branching/merge.script index 9dbc2d84..d73e4835 100755 --- a/tests.branching/merge.script +++ b/tests.branching/merge.script @@ -31,11 +31,13 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch baserock:morphs baserock/newbranch # Make a change to a chunk. +cd baserock/newbranch "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -cd baserock/newbranch/baserock:hello +cd baserock:hello touch newfile.txt git add newfile.txt git commit -m foo --quiet +git push --quiet origin baserock/newbranch # Commit in morphs repo cd ../baserock:morphs |