diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-14 09:34:16 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-14 17:25:29 +0100 |
| commit | 38e226e48b498b0adfb9c8559e592ed16ed8ac56 (patch) | |
| tree | 9d688da4f2afd1cefdb05611c87ea337364ef5ec /tests.branching/branch-creates-new-system-branch-not-from-master.stdout | |
| parent | 154fca16eb20023bdaafc20cb15636c12a33efb1 (diff) | |
| download | morph-38e226e48b498b0adfb9c8559e592ed16ed8ac56.tar.gz | |
Update the stderr and stdout files for the tests.
Rework the test outputs to match reality. This is due to tweaks in how morph
edit/checkout gets its repository now that the copy-from-cache is marginally
more like a traditional clone in terms of what you get at the end.
Diffstat (limited to 'tests.branching/branch-creates-new-system-branch-not-from-master.stdout')
| -rw-r--r-- | tests.branching/branch-creates-new-system-branch-not-from-master.stdout | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout index 443f325b..27e4944a 100644 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout @@ -4,7 +4,6 @@ d ./.morph d ./.morph/cache d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs -d ./.morph/cache/gits/file_morphs/.git d ./newbranch d ./newbranch/.morph-system-branch d ./newbranch/baserock:morphs @@ -14,7 +13,7 @@ f ./newbranch/baserock:morphs/hello-stratum.morph f ./newbranch/baserock:morphs/hello-system.morph f ./newbranch/baserock:morphs/this.is.alfred Current branches: - master + alfred * newbranch Current origin: * remote origin @@ -24,8 +23,7 @@ Current origin: Remote branches: alfred tracked master tracked - Local branches configured for 'git pull': - master merges with remote master - newbranch merges with remote alfred + Local branch configured for 'git pull': + alfred merges with remote alfred Local ref configured for 'git push': - master pushes to master (up to date) + alfred pushes to alfred (up to date) |