diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-02 18:40:41 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-02 18:46:22 +0100 |
| commit | 3190be6906eb21a1ba6878d3c8edb4bd16f925d7 (patch) | |
| tree | 0ab542a7485178546d54e777d9432619c1c8020e /tests/bscs-merge.pass/regular.symb.out/systems | |
| parent | fb9bdefbbbdbd8fef01278b7c3d9c1592998f6d1 (diff) | |
| parent | fef35900a703ac8401e60a2fb89166b3a7e7a27b (diff) | |
| download | tbdiff-3190be6906eb21a1ba6878d3c8edb4bd16f925d7.tar.gz | |
Merge branch 'sam/allow-file-migrations'
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>
Diffstat (limited to 'tests/bscs-merge.pass/regular.symb.out/systems')
7 files changed, 2 insertions, 0 deletions
diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/default b/tests/bscs-merge.pass/regular.symb.out/systems/default new file mode 120000 index 0000000..0f51808 --- /dev/null +++ b/tests/bscs-merge.pass/regular.symb.out/systems/default @@ -0,0 +1 @@ +factory
\ No newline at end of file diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/factory/orig/etc/1 b/tests/bscs-merge.pass/regular.symb.out/systems/factory/orig/etc/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/regular.symb.out/systems/factory/orig/etc/1 diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/1 b/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/1 new file mode 120000 index 0000000..6a93f4f --- /dev/null +++ b/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/1 @@ -0,0 +1 @@ +afile
\ No newline at end of file diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/afile b/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/afile new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/afile diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/version2/orig/etc/1 b/tests/bscs-merge.pass/regular.symb.out/systems/version2/orig/etc/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/regular.symb.out/systems/version2/orig/etc/1 diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/1 b/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/1 diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile b/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile |