diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 17:28:57 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 17:28:57 +0000 |
| commit | 2ac6f661130322e63b8d2737145ea11d445aaa79 (patch) | |
| tree | dd30179d22c09cc73898d7db6218e0d620d74ac8 /tests.branching | |
| parent | 19b16a2cc6d67871d0a4298354eb446ada136a8e (diff) | |
| parent | a5b913a83db94380fc91d15571f55cbf7b5c741b (diff) | |
| download | morph-2ac6f661130322e63b8d2737145ea11d445aaa79.tar.gz | |
Merge branch 'samthursfield/build-without-push' of git://git.baserock.org/baserock/morph
Diffstat (limited to 'tests.branching')
6 files changed, 0 insertions, 11 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 948c5d19..d80f81d7 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 @@ -3,7 +3,6 @@ d . d ./.morph d ./.morph/cache d ./.morph/cache/gits -d ./.morph/cache/gits/file_morphs d ./newbranch d ./newbranch/.morph-system-branch d ./newbranch/test:morphs diff --git a/tests.branching/branch-creates-new-system-branch.stdout b/tests.branching/branch-creates-new-system-branch.stdout index bc4bf568..7c6b3065 100644 --- a/tests.branching/branch-creates-new-system-branch.stdout +++ b/tests.branching/branch-creates-new-system-branch.stdout @@ -3,7 +3,6 @@ d . d ./.morph d ./.morph/cache d ./.morph/cache/gits -d ./.morph/cache/gits/file_morphs d ./newbranch d ./newbranch/.morph-system-branch d ./newbranch/test:morphs diff --git a/tests.branching/branch-works-anywhere.stdout b/tests.branching/branch-works-anywhere.stdout index 3470a804..41f30440 100644 --- a/tests.branching/branch-works-anywhere.stdout +++ b/tests.branching/branch-works-anywhere.stdout @@ -3,7 +3,6 @@ d . d ./.morph d ./.morph/cache d ./.morph/cache/gits -d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch d ./branch1/test:morphs @@ -16,7 +15,6 @@ d . d ./.morph d ./.morph/cache d ./.morph/cache/gits -d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch d ./branch1/test:morphs @@ -36,7 +34,6 @@ d . d ./.morph d ./.morph/cache d ./.morph/cache/gits -d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch d ./branch1/test:morphs @@ -63,7 +60,6 @@ d . d ./.morph d ./.morph/cache d ./.morph/cache/gits -d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch d ./branch1/test:morphs diff --git a/tests.branching/checkout-existing-branch.stdout b/tests.branching/checkout-existing-branch.stdout index 60fca613..50bd01ab 100644 --- a/tests.branching/checkout-existing-branch.stdout +++ b/tests.branching/checkout-existing-branch.stdout @@ -3,7 +3,6 @@ d . d ./.morph d ./.morph/cache d ./.morph/cache/gits -d ./.morph/cache/gits/file_morphs d ./master d ./master/.morph-system-branch d ./master/test:morphs diff --git a/tests.branching/checkout-works-anywhere.stdout b/tests.branching/checkout-works-anywhere.stdout index 6e82072a..15ae3686 100644 --- a/tests.branching/checkout-works-anywhere.stdout +++ b/tests.branching/checkout-works-anywhere.stdout @@ -3,7 +3,6 @@ d . d ./.morph d ./.morph/cache d ./.morph/cache/gits -d ./.morph/cache/gits/file_morphs d ./master d ./master/.morph-system-branch d ./master/test:morphs @@ -16,7 +15,6 @@ d . d ./.morph d ./.morph/cache d ./.morph/cache/gits -d ./.morph/cache/gits/file_morphs d ./master d ./master/.morph-system-branch d ./master/test:morphs 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 549c1c34..1436414d 100644 --- a/tests.branching/edit-works-after-branch-root-was-renamed.stdout +++ b/tests.branching/edit-works-after-branch-root-was-renamed.stdout @@ -2,8 +2,6 @@ d . d ./.morph d ./.morph/cache d ./.morph/cache/gits -d ./.morph/cache/gits/file_hello -d ./.morph/cache/gits/file_morphs d ./master d ./master/.morph-system-branch d ./master/my-renamed-morphs |