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 | |
| 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')
10 files changed, 6 insertions, 21 deletions
diff --git a/tests.branching/branch-cleans-up-on-failure.stderr b/tests.branching/branch-cleans-up-on-failure.stderr index bcb83014..37533408 100644 --- a/tests.branching/branch-cleans-up-on-failure.stderr +++ b/tests.branching/branch-cleans-up-on-failure.stderr @@ -1 +1 @@ -ERROR: Failed to check out ref invalid-ref in TMP/workspace/foo/bar/baserock:morphs +ERROR: Ref invalid-ref is an invalid reference for repo file://TMP/morphs 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) diff --git a/tests.branching/branch-creates-new-system-branch.stdout b/tests.branching/branch-creates-new-system-branch.stdout index e79e8588..5a4bd1d2 100644 --- a/tests.branching/branch-creates-new-system-branch.stdout +++ b/tests.branching/branch-creates-new-system-branch.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 diff --git a/tests.branching/branch-works-anywhere.stdout b/tests.branching/branch-works-anywhere.stdout index ec22698f..484fee45 100644 --- a/tests.branching/branch-works-anywhere.stdout +++ b/tests.branching/branch-works-anywhere.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 ./branch1 d ./branch1/.morph-system-branch d ./branch1/baserock:morphs @@ -18,7 +17,6 @@ d ./.morph d ./.morph/cache d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs -d ./.morph/cache/gits/file_morphs/.git d ./branch1 d ./branch1/.morph-system-branch d ./branch1/baserock:morphs @@ -39,7 +37,6 @@ d ./.morph d ./.morph/cache d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs -d ./.morph/cache/gits/file_morphs/.git d ./branch1 d ./branch1/.morph-system-branch d ./branch1/baserock:morphs @@ -67,7 +64,6 @@ d ./.morph d ./.morph/cache d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs -d ./.morph/cache/gits/file_morphs/.git d ./branch1 d ./branch1/.morph-system-branch d ./branch1/baserock:morphs diff --git a/tests.branching/checkout-cleans-up-on-failure.stderr b/tests.branching/checkout-cleans-up-on-failure.stderr index 182ecb69..5b6a5645 100644 --- a/tests.branching/checkout-cleans-up-on-failure.stderr +++ b/tests.branching/checkout-cleans-up-on-failure.stderr @@ -1 +1 @@ -ERROR: Failed to check out ref i/do/not/exist in TMP/workspace/i/do/not/exist/baserock:morphs +ERROR: Ref i/do/not/exist is an invalid reference for repo file://TMP/morphs diff --git a/tests.branching/checkout-existing-branch.stdout b/tests.branching/checkout-existing-branch.stdout index 4a8a614b..30f48b68 100644 --- a/tests.branching/checkout-existing-branch.stdout +++ b/tests.branching/checkout-existing-branch.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 ./master d ./master/.morph-system-branch d ./master/baserock:morphs diff --git a/tests.branching/checkout-non-aliased-repos.stdout b/tests.branching/checkout-non-aliased-repos.stdout index dbaa3e5c..6f651f5b 100644 --- a/tests.branching/checkout-non-aliased-repos.stdout +++ b/tests.branching/checkout-non-aliased-repos.stdout @@ -4,7 +4,6 @@ d ./.morph d ./.morph/cache d ./.morph/cache/gits d ./.morph/cache/gits/file_git -d ./.morph/cache/gits/file_git/.git d ./master d ./master/.morph-system-branch d ./master/tmp @@ -23,7 +22,6 @@ d ./.morph d ./.morph/cache d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs -d ./.morph/cache/gits/file_morphs/.git d ./master d ./master/.morph-system-branch d ./master/tmp diff --git a/tests.branching/checkout-works-anywhere.stdout b/tests.branching/checkout-works-anywhere.stdout index bb4cc1fa..e8171473 100644 --- a/tests.branching/checkout-works-anywhere.stdout +++ b/tests.branching/checkout-works-anywhere.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 ./master d ./master/.morph-system-branch d ./master/baserock:morphs @@ -18,7 +17,6 @@ d ./.morph d ./.morph/cache d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs -d ./.morph/cache/gits/file_morphs/.git d ./master d ./master/.morph-system-branch d ./master/baserock:morphs diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout index a88a747b..fd549010 100644 --- a/tests.branching/edit-checkouts-existing-chunk.stdout +++ b/tests.branching/edit-checkouts-existing-chunk.stdout @@ -1,6 +1,5 @@ Current branches, morphs: * alfred - master Current branches, hello: * alfred master diff --git a/tests.branching/edit-works-after-branch-root-was-renamed.stdout b/tests.branching/edit-works-after-branch-root-was-renamed.stdout index 5cfe475f..b544d08a 100644 --- a/tests.branching/edit-works-after-branch-root-was-renamed.stdout +++ b/tests.branching/edit-works-after-branch-root-was-renamed.stdout @@ -3,9 +3,7 @@ d ./.morph d ./.morph/cache d ./.morph/cache/gits d ./.morph/cache/gits/file_hello -d ./.morph/cache/gits/file_hello/.git d ./.morph/cache/gits/file_morphs -d ./.morph/cache/gits/file_morphs/.git d ./master d ./master/.morph-system-branch d ./master/baserock:hello |