diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-16 18:16:29 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-16 18:16:29 +0100 |
| commit | 86d3f0110602fb8eea1d00e65abb3025760c6232 (patch) | |
| tree | b90b1e505075d21ce30ce2be2c96cdf937cd7aba /tests.branching | |
| parent | 13246a84c62f54390308cbe9a3eaf1c972bda119 (diff) | |
| parent | dea5d6f8cbd86916ec5373fb704c67e1a33e29a8 (diff) | |
| download | morph-86d3f0110602fb8eea1d00e65abb3025760c6232.tar.gz | |
Merge branch 'baserock/richardmaw/S8740/fix-tests-with-tmpfs'
Reviewed-by: Lars Wirzenius
Reviewed-by: Tiago Gomes
Diffstat (limited to 'tests.branching')
4 files changed, 17 insertions, 17 deletions
diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout index 5fbea686..f6ac79c2 100644 --- a/tests.branching/edit-checkouts-existing-chunk.stdout +++ b/tests.branching/edit-checkouts-existing-chunk.stdout @@ -1,11 +1,11 @@ Current branches: -test:morphs -* alfred - test:hello * alfred master +test:morphs +* alfred + Files in hello: hello.morph diff --git a/tests.branching/edit-clones-chunk.stdout b/tests.branching/edit-clones-chunk.stdout index dd3f00ef..d0bcb565 100644 --- a/tests.branching/edit-clones-chunk.stdout +++ b/tests.branching/edit-clones-chunk.stdout @@ -1,19 +1,21 @@ Current branches: -test:morphs +test:hello master * newbranch -test:hello +test:morphs master * newbranch Current origins: -test:morphs +test:hello * remote origin - Fetch URL: file://TMP/morphs - Push URL: file://TMP/morphs - HEAD branch: master + Fetch URL: file://TMP/hello + Push URL: file://TMP/hello + HEAD branch (remote HEAD is ambiguous, may be one of the following): + alfred + master Remote branches: alfred tracked master tracked @@ -22,13 +24,11 @@ test:morphs Local ref configured for 'git push': master pushes to master (up to date) -test:hello +test:morphs * remote origin - Fetch URL: file://TMP/hello - Push URL: file://TMP/hello - HEAD branch (remote HEAD is ambiguous, may be one of the following): - alfred - master + Fetch URL: file://TMP/morphs + Push URL: file://TMP/morphs + HEAD branch: master Remote branches: alfred tracked master tracked diff --git a/tests.branching/foreach-handles-command-failure.stderr b/tests.branching/foreach-handles-command-failure.stderr index c3085343..c7b8316b 100644 --- a/tests.branching/foreach-handles-command-failure.stderr +++ b/tests.branching/foreach-handles-command-failure.stderr @@ -1 +1 @@ -ERROR: Command failed at repo test:morphs: git remote update non-existant-remote +ERROR: Command failed at repo test:hello: git remote update non-existant-remote diff --git a/tests.branching/foreach-handles-command-failure.stdout b/tests.branching/foreach-handles-command-failure.stdout index 6bb791b3..d687996d 100644 --- a/tests.branching/foreach-handles-command-failure.stdout +++ b/tests.branching/foreach-handles-command-failure.stdout @@ -1,2 +1,2 @@ -test:morphs +test:hello fatal: No such remote or remote group: non-existant-remote |