diff options
Diffstat (limited to 'tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc')
11 files changed, 38 insertions, 0 deletions
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 new file mode 100644 index 0000000..b73be5d --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 @@ -0,0 +1,2 @@ +whereami=v1 +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file2 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file2 new file mode 100644 index 0000000..9fa9381 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file2 @@ -0,0 +1,2 @@ +whereami=vu +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file3 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file3 new file mode 100644 index 0000000..b1580e3 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file3 @@ -0,0 +1,2 @@ +whereami=vu +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file4 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file4 new file mode 100644 index 0000000..ebc4914 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file4 @@ -0,0 +1,2 @@ +whereami=v1,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file5 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file5 new file mode 100644 index 0000000..eddf4ca --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file5 @@ -0,0 +1,2 @@ +whereami=v1,vu +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file6 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file6 new file mode 100644 index 0000000..9802a97 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file6 @@ -0,0 +1,2 @@ +whereami=vu,v2 +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7 new file mode 100644 index 0000000..93c46eb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.1 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.1 new file mode 100644 index 0000000..2462a4f --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.1 @@ -0,0 +1,8 @@ +a=1 +b=2 +c=3 +whereami=v1,vu,v2 +version=v2 +d=1 +e=2 +f=3 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej new file mode 100644 index 0000000..13f6156 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej @@ -0,0 +1,6 @@ +--- file7 ++++ file7 +@@ -1,2 +1,2 @@ + whereami=v1,vu,v2 +-version=v1 ++version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subfile1 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subfile1 new file mode 100644 index 0000000..1cb075e --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subfile1 @@ -0,0 +1,10 @@ +qeq asda d +s +d +a sd +a +d +a +d + +d diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 |