6:09 a.m.
repo: ssh://git@git.baserock.org/baserock/baserock/tbdiff.git
branch: baserock/tiagogomes/bscs-test-suite
commit: 6858235193d798d9985550d58548d22990a4cd27
Tiago Gomes (2):
Remove test mode and provide hooks to use a test suite.
Add a test suite for baserock-system-config-sync
.../baserock-system-config-sync | 32 ++---
.../config-sync-tests/tests.upgrades.dir.symb/vu/1 | 1 -
.../tests.upgrades.etc/v1/sshd_config | 123 --------------------
.../tests.upgrades.etc/v2/sshd_config | 123 --------------------
.../tests.upgrades.etc/vu/sshd_config | 123 --------------------
.../tests.upgrades.regular.symb/vu/1 | 1 -
.../tests.upgrades.symblinks/v1/sl1 | 1 -
.../tests.upgrades.symblinks/v1/sl2 | 1 -
.../tests.upgrades.symblinks/v1/sl3 | 1 -
.../tests.upgrades.symblinks/v2/sl1 | 1 -
.../tests.upgrades.symblinks/v2/sl3 | 1 -
.../tests.upgrades.symblinks/v2/sl4 | 1 -
.../tests.upgrades.symblinks/vu/sl1 | 1 -
.../tests.upgrades.symblinks/vu/sl2 | 1 -
.../tests.upgrades.symblinks/vu/sl4 | 1 -
.../config-sync-tests/tests.upgrades/v1/file1 | 2 -
.../config-sync-tests/tests.upgrades/v1/file4 | 2 -
.../config-sync-tests/tests.upgrades/v1/file5 | 2 -
.../config-sync-tests/tests.upgrades/v1/file7 | 2 -
.../config-sync-tests/tests.upgrades/v1/file7.1 | 8 --
.../tests.upgrades/v1/subdir1/subfile1 | 10 --
.../config-sync-tests/tests.upgrades/v2/file3 | 2 -
.../config-sync-tests/tests.upgrades/v2/file4 | 2 -
.../config-sync-tests/tests.upgrades/v2/file6 | 2 -
.../config-sync-tests/tests.upgrades/v2/file7 | 2 -
.../config-sync-tests/tests.upgrades/v2/file7.1 | 8 --
.../tests.upgrades/v2/subdir1/subfile1 | 10 --
.../config-sync-tests/tests.upgrades/vu/file2 | 2 -
.../config-sync-tests/tests.upgrades/vu/file5 | 2 -
.../config-sync-tests/tests.upgrades/vu/file6 | 2 -
.../config-sync-tests/tests.upgrades/vu/file7 | 2 -
tests/bscs-merge.fail/dir.symb.in/systems/default | 1 +
.../dir.symb.in/systems/factory/run/etc/1 | 1 +
tests/bscs-merge.fail/dir.symb.out/systems/default | 1 +
.../dir.symb.out/systems/factory/run/etc/1 | 1 +
.../bscs-merge.fail/regular.dir.in/systems/default | 1 +
.../regular.dir.out/systems/default | 1 +
.../regular.symb.in/systems/default | 1 +
.../regular.symb.in/systems/factory/run/etc/1 | 1 +
.../regular.symb.out/systems/default | 1 +
.../regular.symb.out/systems/factory/run/etc/1 | 1 +
tests/bscs-merge.pass/empty.in/systems/default | 1 +
.../empty.in/systems/factory/orig/etc/v1v2-1 | 1 +
.../empty.in/systems/factory/orig/etc/v1v2-2 | 1 +
.../empty.in/systems/factory/orig/etc/v1vu-1 | 1 +
.../empty.in/systems/factory/orig/etc/v1vuv2-1 | 1 +
.../empty.in/systems/factory/run/etc/v1vu-2 | 1 +
.../empty.in/systems/factory/run/etc/v1vuv2-1 | 1 +
.../empty.in/systems/factory/run/etc/vuv2-2 | 1 +
.../empty.in/systems/version2/orig/etc/v1v2-1 | 1 +
.../empty.in/systems/version2/orig/etc/v1vuv2-1 | 1 +
.../empty.in/systems/version2/orig/etc/vuv2-1 | 1 +
.../empty.in/systems/version2/run/etc/v1v2-1 | 1 +
.../empty.in/systems/version2/run/etc/v1vuv2-1 | 1 +
.../empty.in/systems/version2/run/etc/vuv2-1 | 1 +
tests/bscs-merge.pass/empty.out/systems/default | 1 +
.../empty.out/systems/factory/orig/etc/v1v2-1 | 1 +
.../empty.out/systems/factory/orig/etc/v1v2-2 | 1 +
.../empty.out/systems/factory/orig/etc/v1vu-1 | 1 +
.../empty.out/systems/factory/orig/etc/v1vuv2-1 | 1 +
.../empty.out/systems/factory/run/etc/v1vu-2 | 1 +
.../empty.out/systems/factory/run/etc/v1vuv2-1 | 1 +
.../empty.out/systems/factory/run/etc/vuv2-2 | 1 +
.../empty.out/systems/version2/orig/etc/v1v2-1 | 1 +
.../empty.out/systems/version2/orig/etc/v1vuv2-1 | 1 +
.../empty.out/systems/version2/orig/etc/vuv2-1 | 1 +
.../empty.out/systems/version2/run/etc/v1v2-1 | 1 +
.../empty.out/systems/version2/run/etc/v1vu-2 | 1 +
.../empty.out/systems/version2/run/etc/v1vuv2-1 | 1 +
.../empty.out/systems/version2/run/etc/vuv2-2 | 1 +
tests/bscs-merge.pass/sshconf.in/systems/default | 1 +
.../systems/factory/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../sshconf.in/systems/factory/run/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/run/etc/sshd_config | 123 ++++++++++++++++++++
tests/bscs-merge.pass/sshconf.out/systems/default | 1 +
.../systems/factory/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/factory/run/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/run/etc/sshd_config | 123 ++++++++++++++++++++
tests/bscs-merge.pass/symblinks.in/systems/default | 1 +
.../symblinks.in/systems/factory/orig/etc/v1 | 1 +
.../symblinks.in/systems/factory/orig/etc/v1v2 | 1 +
.../symblinks.in/systems/factory/orig/etc/v1vu | 1 +
.../symblinks.in/systems/factory/orig/etc/v1vuv2 | 1 +
.../symblinks.in/systems/factory/run/etc/v1vu | 1 +
.../symblinks.in/systems/factory/run/etc/v1vuv2 | 1 +
.../symblinks.in/systems/factory/run/etc/vu | 1 +
.../symblinks.in/systems/factory/run/etc/vuv2 | 1 +
.../symblinks.in/systems/version2/orig/etc/v1v2 | 1 +
.../symblinks.in/systems/version2/orig/etc/v1vuv2 | 1 +
.../symblinks.in/systems/version2/orig/etc/v2 | 1 +
.../symblinks.in/systems/version2/orig/etc/vuv2 | 1 +
.../symblinks.in/systems/version2/run/etc/v1v2 | 1 +
.../symblinks.in/systems/version2/run/etc/v1vuv2 | 1 +
.../symblinks.in/systems/version2/run/etc/v2 | 1 +
.../symblinks.in/systems/version2/run/etc/vuv2 | 1 +
tests/bscs-merge.pass/symblinks.in/v1 | 1 +
tests/bscs-merge.pass/symblinks.in/v2 | 1 +
tests/bscs-merge.pass/symblinks.in/vu | 1 +
.../bscs-merge.pass/symblinks.out/systems/default | 1 +
.../symblinks.out/systems/factory/orig/etc/v1 | 1 +
.../symblinks.out/systems/factory/orig/etc/v1v2 | 1 +
.../symblinks.out/systems/factory/orig/etc/v1vu | 1 +
.../symblinks.out/systems/factory/orig/etc/v1vuv2 | 1 +
.../symblinks.out/systems/factory/run/etc/v1vu | 1 +
.../symblinks.out/systems/factory/run/etc/v1vuv2 | 1 +
.../symblinks.out/systems/factory/run/etc/vu | 1 +
.../symblinks.out/systems/factory/run/etc/vuv2 | 1 +
.../symblinks.out/systems/version2/orig/etc/v1v2 | 1 +
.../symblinks.out/systems/version2/orig/etc/v1vuv2 | 1 +
.../symblinks.out/systems/version2/orig/etc/v2 | 1 +
.../symblinks.out/systems/version2/orig/etc/vuv2 | 1 +
.../symblinks.out/systems/version2/run/etc/v1 | 1 +
.../symblinks.out/systems/version2/run/etc/v1v2 | 1 +
.../symblinks.out/systems/version2/run/etc/v1vu | 1 +
.../symblinks.out/systems/version2/run/etc/v1vuv2 | 1 +
.../symblinks.out/systems/version2/run/etc/v2 | 1 +
.../symblinks.out/systems/version2/run/etc/vu | 1 +
.../symblinks.out/systems/version2/run/etc/vuv2 | 1 +
tests/bscs-merge.pass/symblinks.out/v1 | 1 +
tests/bscs-merge.pass/symblinks.out/v2 | 1 +
tests/bscs-merge.pass/symblinks.out/vu | 1 +
tests/bscs-merge.pass/upgrades.in/systems/default | 1 +
.../upgrades.in/systems/factory/orig/etc/file1 | 2 +
.../upgrades.in/systems/factory/orig/etc/file4 | 2 +
.../upgrades.in/systems/factory/orig/etc/file5 | 2 +
.../upgrades.in/systems/factory/orig/etc/file7 | 2 +
.../upgrades.in/systems/factory/orig/etc/file7.1 | 8 ++
.../systems/factory/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.in/systems/factory/run/etc/file2 | 2 +
.../upgrades.in/systems/factory/run/etc/file5 | 2 +
.../upgrades.in/systems/factory/run/etc/file6 | 2 +
.../upgrades.in/systems/factory/run/etc/file7 | 2 +
.../upgrades.in/systems/version2/orig/etc/file3 | 2 +
.../upgrades.in/systems/version2/orig/etc/file4 | 2 +
.../upgrades.in/systems/version2/orig/etc/file6 | 2 +
.../upgrades.in/systems/version2/orig/etc/file7 | 2 +
.../upgrades.in/systems/version2/orig/etc/file7.1 | 8 ++
.../systems/version2/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.in/systems/version2/run/etc/file3 | 2 +
.../upgrades.in/systems/version2/run/etc/file4 | 2 +
.../upgrades.in/systems/version2/run/etc/file6 | 2 +
.../upgrades.in/systems/version2/run/etc/file7 | 2 +
.../upgrades.in/systems/version2/run/etc/file7.1 | 8 ++
.../systems/version2/run/etc/subdir1/subfile1 | 10 ++
tests/bscs-merge.pass/upgrades.out/systems/default | 1 +
.../upgrades.out/systems/factory/orig/etc/file1 | 2 +
.../upgrades.out/systems/factory/orig/etc/file4 | 2 +
.../upgrades.out/systems/factory/orig/etc/file5 | 2 +
.../upgrades.out/systems/factory/orig/etc/file7 | 2 +
.../upgrades.out/systems/factory/orig/etc/file7.1 | 8 ++
.../systems/factory/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.out/systems/factory/run/etc/file2 | 2 +
.../upgrades.out/systems/factory/run/etc/file5 | 2 +
.../upgrades.out/systems/factory/run/etc/file6 | 2 +
.../upgrades.out/systems/factory/run/etc/file7 | 2 +
.../upgrades.out/systems/version2/orig/etc/file3 | 2 +
.../upgrades.out/systems/version2/orig/etc/file4 | 2 +
.../upgrades.out/systems/version2/orig/etc/file6 | 2 +
.../upgrades.out/systems/version2/orig/etc/file7 | 2 +
.../upgrades.out/systems/version2/orig/etc/file7.1 | 8 ++
.../systems/version2/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.out/systems/version2/run/etc/file1 | 2 +
.../upgrades.out/systems/version2/run/etc/file2 | 2 +
.../upgrades.out/systems/version2/run/etc/file3 | 2 +
.../upgrades.out/systems/version2/run/etc/file4 | 2 +
.../upgrades.out/systems/version2/run/etc/file5 | 2 +
.../upgrades.out/systems/version2/run/etc/file6 | 2 +
.../upgrades.out/systems/version2/run/etc/file7 | 2 +
.../upgrades.out/systems/version2/run/etc/file7.1 | 8 ++
.../systems/version2/run/etc/file7.rej | 6 +
.../systems/version2/run/etc/subdir1/subfile1 | 10 ++
tests/bscs-sync.in/systems/default | 1 +
tests/bscs-sync.in/systems/factory/orig/etc/config | 1 +
.../bscs-sync.in/systems/factory/orig/etc/config1 | 2 +
.../systems/factory/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.in/systems/factory/run/etc/config | 1 +
tests/bscs-sync.in/systems/factory/run/etc/config1 | 3 +
.../systems/factory/run/etc/folder1/config2 | 2 +
.../bscs-sync.in/systems/version2/orig/etc/config | 1 +
.../bscs-sync.in/systems/version2/orig/etc/config1 | 2 +
.../systems/version2/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.in/systems/version2/run/etc/config | 1 +
.../bscs-sync.in/systems/version2/run/etc/config1 | 3 +
.../systems/version2/run/etc/folder1/config2 | 2 +
.../bscs-sync.in/systems/version3/orig/etc/config | 1 +
.../bscs-sync.in/systems/version3/orig/etc/config1 | 2 +
.../systems/version3/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.in/systems/version3/run/etc/config | 1 +
.../bscs-sync.in/systems/version3/run/etc/config1 | 3 +
.../systems/version3/run/etc/folder1/config2 | 2 +
tests/bscs-sync.out/systems/default | 1 +
.../bscs-sync.out/systems/factory/orig/etc/config | 1 +
.../bscs-sync.out/systems/factory/orig/etc/config1 | 2 +
.../systems/factory/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.out/systems/factory/run/etc/config | 1 +
.../bscs-sync.out/systems/factory/run/etc/config1 | 3 +
.../systems/factory/run/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version2/orig/etc/config | 1 +
.../systems/version2/orig/etc/config1 | 2 +
.../systems/version2/orig/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version2/run/etc/config | 1 +
.../bscs-sync.out/systems/version2/run/etc/config1 | 3 +
.../systems/version2/run/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version3/orig/etc/config | 1 +
.../systems/version3/orig/etc/config1 | 2 +
.../systems/version3/orig/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version3/run/etc/config | 1 +
.../bscs-sync.out/systems/version3/run/etc/config1 | 3 +
.../systems/version3/run/etc/folder1/config2 | 2 +
tests/fake_mounting_script.sh | 36 ++++++
tests/run_tests.sh | 69 ++++++++++-
213 files changed, 1434 insertions(+), 465 deletions(-)
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7
create mode 120000 tests/bscs-merge.fail/dir.symb.in/systems/default
create mode 120000 tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/afile
create mode 120000 tests/bscs-merge.fail/dir.symb.out/systems/default
create mode 120000 tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/afile
create mode 120000 tests/bscs-merge.fail/regular.dir.in/systems/default
create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/factory/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.fail/regular.dir.out/systems/default
create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/factory/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.in/systems/default
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/factory/orig/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.out/systems/default
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/factory/orig/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/afile
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.pass/empty.in/systems/default
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-2
create mode 120000 tests/bscs-merge.pass/empty.out/systems/default
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2
create mode 120000 tests/bscs-merge.pass/sshconf.in/systems/default
create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/factory/orig/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/factory/run/etc/sshd_config
create mode 100644
tests/bscs-merge.pass/sshconf.in/systems/version2/orig/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/version2/run/etc/sshd_config
create mode 120000 tests/bscs-merge.pass/sshconf.out/systems/default
create mode 100644
tests/bscs-merge.pass/sshconf.out/systems/factory/orig/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.out/systems/factory/run/etc/sshd_config
create mode 100644
tests/bscs-merge.pass/sshconf.out/systems/version2/orig/etc/sshd_config
create mode 100644
tests/bscs-merge.pass/sshconf.out/systems/version2/run/etc/sshd_config
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/default
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vu
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/vuv2
create mode 100644 tests/bscs-merge.pass/symblinks.in/v1
create mode 100644 tests/bscs-merge.pass/symblinks.in/v2
create mode 100644 tests/bscs-merge.pass/symblinks.in/vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/default
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vuv2
create mode 100644 tests/bscs-merge.pass/symblinks.out/v1
create mode 100644 tests/bscs-merge.pass/symblinks.out/v2
create mode 100644 tests/bscs-merge.pass/symblinks.out/vu
create mode 120000 tests/bscs-merge.pass/upgrades.in/systems/default
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file1
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7.1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file2
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4
create mode 120000 tests/bscs-merge.pass/upgrades.out/systems/default
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7.1
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file2
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7.1
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file2
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4
create mode 120000 tests/bscs-sync.in/systems/default
create mode 120000 tests/bscs-sync.in/systems/factory/orig/etc/config
create mode 100644 tests/bscs-sync.in/systems/factory/orig/etc/config1
create mode 100644 tests/bscs-sync.in/systems/factory/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/factory/run/etc/config
create mode 100644 tests/bscs-sync.in/systems/factory/run/etc/config1
create mode 100644 tests/bscs-sync.in/systems/factory/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/version2/orig/etc/config
create mode 100644 tests/bscs-sync.in/systems/version2/orig/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version2/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/version2/run/etc/config
create mode 100644 tests/bscs-sync.in/systems/version2/run/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version2/run/etc/folder1/config2
create mode 100644
tests/bscs-sync.in/systems/version2/run/etc/folder2/iamgoingbeoverwritten
create mode 120000 tests/bscs-sync.in/systems/version3/orig/etc/config
create mode 100644 tests/bscs-sync.in/systems/version3/orig/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version3/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/version3/run/etc/config
create mode 100644 tests/bscs-sync.in/systems/version3/run/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version3/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/default
create mode 120000 tests/bscs-sync.out/systems/factory/orig/etc/config
create mode 100644 tests/bscs-sync.out/systems/factory/orig/etc/config1
create mode 100644 tests/bscs-sync.out/systems/factory/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/factory/run/etc/config
create mode 100644 tests/bscs-sync.out/systems/factory/run/etc/config1
create mode 100644 tests/bscs-sync.out/systems/factory/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version2/orig/etc/config
create mode 100644 tests/bscs-sync.out/systems/version2/orig/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version2/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version2/run/etc/config
create mode 100644 tests/bscs-sync.out/systems/version2/run/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version2/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version3/orig/etc/config
create mode 100644 tests/bscs-sync.out/systems/version3/orig/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version3/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version3/run/etc/config
create mode 100644 tests/bscs-sync.out/systems/version3/run/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version3/run/etc/folder1/config2
create mode 100755 tests/fake_mounting_script.sh
--
1.7.10.4
6:09 a.m.
New subject: [PATCH 1/2] Remove test mode and provide hooks to use a test suite.
Tests will now be handled by a test suite in a future commit, so this
mode will not be needed anymore. The test suite will work by replacing
the mounting script by a fake mounting script that points to a directory
with a systems folder.
Also add trap again, now that it is more tested.
---
.../baserock-system-config-sync | 32 ++++++--------------
1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/baserock-system-config-sync/baserock-system-config-sync
b/baserock-system-config-sync/baserock-system-config-sync
index c9f2de0..9b00625 100755
--- a/baserock-system-config-sync/baserock-system-config-sync
+++ b/baserock-system-config-sync/baserock-system-config-sync
@@ -17,13 +17,13 @@
set -eu
+: ${mounting_script="$(dirname
"$0")/../libexec/mount-system-versions-dir"}
-mounting_script="$(dirname
"$0")/../libexec/mount-system-versions-dir"
+: ${unmount="umount"}
usage() {
- echo "Usage: $(basename $0) test V1_DIR VU_DIR V2_DIR VT_DIR" >&2
- echo " $(basename $0) merge NEW_VERSION_LABEL" >&2
+ echo "Usage: $(basename $0) merge NEW_VERSION_LABEL" >&2
echo " $(basename $0) sync CANONICAL_VERSION_LABEL" >&2
exit 1
}
@@ -35,8 +35,7 @@ die () {
}
-file_type()
-{
+file_type() {
mode=$(printf '%o\n' 0x$(stat -c %f "$1"))
case "$mode" in
140???) echo "socket" ;;
@@ -55,7 +54,7 @@ check_same_type() {
type1="$(file_type $1)"
type2="$(file_type $2)"
if [ "$type1" != "$type2" ]; then
- die "found two different types for '$3':" \
+ die "ERROR: found two different types for '$3':" \
"$type1 and $type2"
fi
}
@@ -173,20 +172,7 @@ if [ "$#" = 0 ]; then
fi
-if [ "$1" = "test" ]; then
- if [ "$#" != 5 ]; then
- usage "$0"
- fi
- local v1="$2"
- local vu="$3"
- local v2="$4"
- local vt="$5"
- mkdir -p "$vt"
- # For every pathname in V1, Vuser, or V2
- merge "$v1" "$v1" "$vu" "$v2"
"$vt"
- merge "$vu" "$v1" "$vu" "$v2"
"$vt"
- merge "$v2" "$v1" "$vu" "$v2"
"$vt"
-elif [ "$1" = "merge" ]; then
+if [ "$1" = "merge" ]; then
if [ "$#" != 2 ]; then
usage "$0"
fi
@@ -194,6 +180,7 @@ elif [ "$1" = "merge" ]; then
local mounting_point=$(mktemp -d)
"$mounting_script" "$mounting_point"
if [ ! -d "$mounting_point/systems/$new_version" ]; then
+ "$unmount" "$mounting_point"
die "Error: version not found - '$new_version'"
fi
local v1_dir="$mounting_point/systems/default/orig/etc"
@@ -201,7 +188,7 @@ elif [ "$1" = "merge" ]; then
local v2_dir="$mounting_point/systems/$new_version/run/etc"
local vt_dir="$mounting_point/systems/$new_version/run/etc.new"
mkdir "$vt_dir"
-
+ trap 'rm -rvf "$vt_dir"; "$unmount"
"$mounting_point"' EXIT
# For every pathname in V1, Vuser, or V2
merge "$v1_dir" "$v1_dir" "$vu_dir" "$v2_dir"
"$vt_dir"
merge "$vu_dir" "$v1_dir" "$vu_dir" "$v2_dir"
"$vt_dir"
@@ -209,11 +196,11 @@ elif [ "$1" = "merge" ]; then
rm -rf "$v2_dir"
mv "$vt_dir" "$v2_dir"
- umount "$mounting_point"
elif [ "$1" = "sync" ]; then
local canonical_version="$2"
local mounting_point=$(mktemp -d)
"$mounting_script" "$mounting_point"
+ trap '"$unmount" "$mounting_point"' EXIT
if [ ! -d "$mounting_point/systems/$canonical_version" ]; then
die "Error: version not found - '$canonical_version'"
fi
@@ -228,7 +215,6 @@ elif [ "$1" = "sync" ]; then
rm -rf "$version_dir/run/etc.old"
fi
done
- umount "$mounting_point"
else
usage "$0"
fi
--
1.7.10.4
6:09 a.m.
New subject: [PATCH 2/2] Add a test suite for baserock-system-config-sync
---
.../config-sync-tests/tests.upgrades.dir.symb/vu/1 | 1 -
.../tests.upgrades.etc/v1/sshd_config | 123 --------------------
.../tests.upgrades.etc/v2/sshd_config | 123 --------------------
.../tests.upgrades.etc/vu/sshd_config | 123 --------------------
.../tests.upgrades.regular.symb/vu/1 | 1 -
.../tests.upgrades.symblinks/v1/sl1 | 1 -
.../tests.upgrades.symblinks/v1/sl2 | 1 -
.../tests.upgrades.symblinks/v1/sl3 | 1 -
.../tests.upgrades.symblinks/v2/sl1 | 1 -
.../tests.upgrades.symblinks/v2/sl3 | 1 -
.../tests.upgrades.symblinks/v2/sl4 | 1 -
.../tests.upgrades.symblinks/vu/sl1 | 1 -
.../tests.upgrades.symblinks/vu/sl2 | 1 -
.../tests.upgrades.symblinks/vu/sl4 | 1 -
.../config-sync-tests/tests.upgrades/v1/file1 | 2 -
.../config-sync-tests/tests.upgrades/v1/file4 | 2 -
.../config-sync-tests/tests.upgrades/v1/file5 | 2 -
.../config-sync-tests/tests.upgrades/v1/file7 | 2 -
.../config-sync-tests/tests.upgrades/v1/file7.1 | 8 --
.../tests.upgrades/v1/subdir1/subfile1 | 10 --
.../config-sync-tests/tests.upgrades/v2/file3 | 2 -
.../config-sync-tests/tests.upgrades/v2/file4 | 2 -
.../config-sync-tests/tests.upgrades/v2/file6 | 2 -
.../config-sync-tests/tests.upgrades/v2/file7 | 2 -
.../config-sync-tests/tests.upgrades/v2/file7.1 | 8 --
.../tests.upgrades/v2/subdir1/subfile1 | 10 --
.../config-sync-tests/tests.upgrades/vu/file2 | 2 -
.../config-sync-tests/tests.upgrades/vu/file5 | 2 -
.../config-sync-tests/tests.upgrades/vu/file6 | 2 -
.../config-sync-tests/tests.upgrades/vu/file7 | 2 -
tests/bscs-merge.fail/dir.symb.in/systems/default | 1 +
.../dir.symb.in/systems/factory/run/etc/1 | 1 +
tests/bscs-merge.fail/dir.symb.out/systems/default | 1 +
.../dir.symb.out/systems/factory/run/etc/1 | 1 +
.../bscs-merge.fail/regular.dir.in/systems/default | 1 +
.../regular.dir.out/systems/default | 1 +
.../regular.symb.in/systems/default | 1 +
.../regular.symb.in/systems/factory/run/etc/1 | 1 +
.../regular.symb.out/systems/default | 1 +
.../regular.symb.out/systems/factory/run/etc/1 | 1 +
tests/bscs-merge.pass/empty.in/systems/default | 1 +
.../empty.in/systems/factory/orig/etc/v1v2-1 | 1 +
.../empty.in/systems/factory/orig/etc/v1v2-2 | 1 +
.../empty.in/systems/factory/orig/etc/v1vu-1 | 1 +
.../empty.in/systems/factory/orig/etc/v1vuv2-1 | 1 +
.../empty.in/systems/factory/run/etc/v1vu-2 | 1 +
.../empty.in/systems/factory/run/etc/v1vuv2-1 | 1 +
.../empty.in/systems/factory/run/etc/vuv2-2 | 1 +
.../empty.in/systems/version2/orig/etc/v1v2-1 | 1 +
.../empty.in/systems/version2/orig/etc/v1vuv2-1 | 1 +
.../empty.in/systems/version2/orig/etc/vuv2-1 | 1 +
.../empty.in/systems/version2/run/etc/v1v2-1 | 1 +
.../empty.in/systems/version2/run/etc/v1vuv2-1 | 1 +
.../empty.in/systems/version2/run/etc/vuv2-1 | 1 +
tests/bscs-merge.pass/empty.out/systems/default | 1 +
.../empty.out/systems/factory/orig/etc/v1v2-1 | 1 +
.../empty.out/systems/factory/orig/etc/v1v2-2 | 1 +
.../empty.out/systems/factory/orig/etc/v1vu-1 | 1 +
.../empty.out/systems/factory/orig/etc/v1vuv2-1 | 1 +
.../empty.out/systems/factory/run/etc/v1vu-2 | 1 +
.../empty.out/systems/factory/run/etc/v1vuv2-1 | 1 +
.../empty.out/systems/factory/run/etc/vuv2-2 | 1 +
.../empty.out/systems/version2/orig/etc/v1v2-1 | 1 +
.../empty.out/systems/version2/orig/etc/v1vuv2-1 | 1 +
.../empty.out/systems/version2/orig/etc/vuv2-1 | 1 +
.../empty.out/systems/version2/run/etc/v1v2-1 | 1 +
.../empty.out/systems/version2/run/etc/v1vu-2 | 1 +
.../empty.out/systems/version2/run/etc/v1vuv2-1 | 1 +
.../empty.out/systems/version2/run/etc/vuv2-2 | 1 +
tests/bscs-merge.pass/sshconf.in/systems/default | 1 +
.../systems/factory/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../sshconf.in/systems/factory/run/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/run/etc/sshd_config | 123 ++++++++++++++++++++
tests/bscs-merge.pass/sshconf.out/systems/default | 1 +
.../systems/factory/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/factory/run/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/orig/etc/sshd_config | 123 ++++++++++++++++++++
.../systems/version2/run/etc/sshd_config | 123 ++++++++++++++++++++
tests/bscs-merge.pass/symblinks.in/systems/default | 1 +
.../symblinks.in/systems/factory/orig/etc/v1 | 1 +
.../symblinks.in/systems/factory/orig/etc/v1v2 | 1 +
.../symblinks.in/systems/factory/orig/etc/v1vu | 1 +
.../symblinks.in/systems/factory/orig/etc/v1vuv2 | 1 +
.../symblinks.in/systems/factory/run/etc/v1vu | 1 +
.../symblinks.in/systems/factory/run/etc/v1vuv2 | 1 +
.../symblinks.in/systems/factory/run/etc/vu | 1 +
.../symblinks.in/systems/factory/run/etc/vuv2 | 1 +
.../symblinks.in/systems/version2/orig/etc/v1v2 | 1 +
.../symblinks.in/systems/version2/orig/etc/v1vuv2 | 1 +
.../symblinks.in/systems/version2/orig/etc/v2 | 1 +
.../symblinks.in/systems/version2/orig/etc/vuv2 | 1 +
.../symblinks.in/systems/version2/run/etc/v1v2 | 1 +
.../symblinks.in/systems/version2/run/etc/v1vuv2 | 1 +
.../symblinks.in/systems/version2/run/etc/v2 | 1 +
.../symblinks.in/systems/version2/run/etc/vuv2 | 1 +
tests/bscs-merge.pass/symblinks.in/v1 | 1 +
tests/bscs-merge.pass/symblinks.in/v2 | 1 +
tests/bscs-merge.pass/symblinks.in/vu | 1 +
.../bscs-merge.pass/symblinks.out/systems/default | 1 +
.../symblinks.out/systems/factory/orig/etc/v1 | 1 +
.../symblinks.out/systems/factory/orig/etc/v1v2 | 1 +
.../symblinks.out/systems/factory/orig/etc/v1vu | 1 +
.../symblinks.out/systems/factory/orig/etc/v1vuv2 | 1 +
.../symblinks.out/systems/factory/run/etc/v1vu | 1 +
.../symblinks.out/systems/factory/run/etc/v1vuv2 | 1 +
.../symblinks.out/systems/factory/run/etc/vu | 1 +
.../symblinks.out/systems/factory/run/etc/vuv2 | 1 +
.../symblinks.out/systems/version2/orig/etc/v1v2 | 1 +
.../symblinks.out/systems/version2/orig/etc/v1vuv2 | 1 +
.../symblinks.out/systems/version2/orig/etc/v2 | 1 +
.../symblinks.out/systems/version2/orig/etc/vuv2 | 1 +
.../symblinks.out/systems/version2/run/etc/v1 | 1 +
.../symblinks.out/systems/version2/run/etc/v1v2 | 1 +
.../symblinks.out/systems/version2/run/etc/v1vu | 1 +
.../symblinks.out/systems/version2/run/etc/v1vuv2 | 1 +
.../symblinks.out/systems/version2/run/etc/v2 | 1 +
.../symblinks.out/systems/version2/run/etc/vu | 1 +
.../symblinks.out/systems/version2/run/etc/vuv2 | 1 +
tests/bscs-merge.pass/symblinks.out/v1 | 1 +
tests/bscs-merge.pass/symblinks.out/v2 | 1 +
tests/bscs-merge.pass/symblinks.out/vu | 1 +
tests/bscs-merge.pass/upgrades.in/systems/default | 1 +
.../upgrades.in/systems/factory/orig/etc/file1 | 2 +
.../upgrades.in/systems/factory/orig/etc/file4 | 2 +
.../upgrades.in/systems/factory/orig/etc/file5 | 2 +
.../upgrades.in/systems/factory/orig/etc/file7 | 2 +
.../upgrades.in/systems/factory/orig/etc/file7.1 | 8 ++
.../systems/factory/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.in/systems/factory/run/etc/file2 | 2 +
.../upgrades.in/systems/factory/run/etc/file5 | 2 +
.../upgrades.in/systems/factory/run/etc/file6 | 2 +
.../upgrades.in/systems/factory/run/etc/file7 | 2 +
.../upgrades.in/systems/version2/orig/etc/file3 | 2 +
.../upgrades.in/systems/version2/orig/etc/file4 | 2 +
.../upgrades.in/systems/version2/orig/etc/file6 | 2 +
.../upgrades.in/systems/version2/orig/etc/file7 | 2 +
.../upgrades.in/systems/version2/orig/etc/file7.1 | 8 ++
.../systems/version2/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.in/systems/version2/run/etc/file3 | 2 +
.../upgrades.in/systems/version2/run/etc/file4 | 2 +
.../upgrades.in/systems/version2/run/etc/file6 | 2 +
.../upgrades.in/systems/version2/run/etc/file7 | 2 +
.../upgrades.in/systems/version2/run/etc/file7.1 | 8 ++
.../systems/version2/run/etc/subdir1/subfile1 | 10 ++
tests/bscs-merge.pass/upgrades.out/systems/default | 1 +
.../upgrades.out/systems/factory/orig/etc/file1 | 2 +
.../upgrades.out/systems/factory/orig/etc/file4 | 2 +
.../upgrades.out/systems/factory/orig/etc/file5 | 2 +
.../upgrades.out/systems/factory/orig/etc/file7 | 2 +
.../upgrades.out/systems/factory/orig/etc/file7.1 | 8 ++
.../systems/factory/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.out/systems/factory/run/etc/file2 | 2 +
.../upgrades.out/systems/factory/run/etc/file5 | 2 +
.../upgrades.out/systems/factory/run/etc/file6 | 2 +
.../upgrades.out/systems/factory/run/etc/file7 | 2 +
.../upgrades.out/systems/version2/orig/etc/file3 | 2 +
.../upgrades.out/systems/version2/orig/etc/file4 | 2 +
.../upgrades.out/systems/version2/orig/etc/file6 | 2 +
.../upgrades.out/systems/version2/orig/etc/file7 | 2 +
.../upgrades.out/systems/version2/orig/etc/file7.1 | 8 ++
.../systems/version2/orig/etc/subdir1/subfile1 | 10 ++
.../upgrades.out/systems/version2/run/etc/file1 | 2 +
.../upgrades.out/systems/version2/run/etc/file2 | 2 +
.../upgrades.out/systems/version2/run/etc/file3 | 2 +
.../upgrades.out/systems/version2/run/etc/file4 | 2 +
.../upgrades.out/systems/version2/run/etc/file5 | 2 +
.../upgrades.out/systems/version2/run/etc/file6 | 2 +
.../upgrades.out/systems/version2/run/etc/file7 | 2 +
.../upgrades.out/systems/version2/run/etc/file7.1 | 8 ++
.../systems/version2/run/etc/file7.rej | 6 +
.../systems/version2/run/etc/subdir1/subfile1 | 10 ++
tests/bscs-sync.in/systems/default | 1 +
tests/bscs-sync.in/systems/factory/orig/etc/config | 1 +
.../bscs-sync.in/systems/factory/orig/etc/config1 | 2 +
.../systems/factory/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.in/systems/factory/run/etc/config | 1 +
tests/bscs-sync.in/systems/factory/run/etc/config1 | 3 +
.../systems/factory/run/etc/folder1/config2 | 2 +
.../bscs-sync.in/systems/version2/orig/etc/config | 1 +
.../bscs-sync.in/systems/version2/orig/etc/config1 | 2 +
.../systems/version2/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.in/systems/version2/run/etc/config | 1 +
.../bscs-sync.in/systems/version2/run/etc/config1 | 3 +
.../systems/version2/run/etc/folder1/config2 | 2 +
.../bscs-sync.in/systems/version3/orig/etc/config | 1 +
.../bscs-sync.in/systems/version3/orig/etc/config1 | 2 +
.../systems/version3/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.in/systems/version3/run/etc/config | 1 +
.../bscs-sync.in/systems/version3/run/etc/config1 | 3 +
.../systems/version3/run/etc/folder1/config2 | 2 +
tests/bscs-sync.out/systems/default | 1 +
.../bscs-sync.out/systems/factory/orig/etc/config | 1 +
.../bscs-sync.out/systems/factory/orig/etc/config1 | 2 +
.../systems/factory/orig/etc/folder1/config2 | 2 +
tests/bscs-sync.out/systems/factory/run/etc/config | 1 +
.../bscs-sync.out/systems/factory/run/etc/config1 | 3 +
.../systems/factory/run/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version2/orig/etc/config | 1 +
.../systems/version2/orig/etc/config1 | 2 +
.../systems/version2/orig/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version2/run/etc/config | 1 +
.../bscs-sync.out/systems/version2/run/etc/config1 | 3 +
.../systems/version2/run/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version3/orig/etc/config | 1 +
.../systems/version3/orig/etc/config1 | 2 +
.../systems/version3/orig/etc/folder1/config2 | 2 +
.../bscs-sync.out/systems/version3/run/etc/config | 1 +
.../bscs-sync.out/systems/version3/run/etc/config1 | 3 +
.../systems/version3/run/etc/folder1/config2 | 2 +
tests/fake_mounting_script.sh | 36 ++++++
tests/run_tests.sh | 69 ++++++++++-
212 files changed, 1425 insertions(+), 442 deletions(-)
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2
delete mode 120000
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1
delete mode 100644
baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6
delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7
create mode 120000 tests/bscs-merge.fail/dir.symb.in/systems/default
create mode 120000 tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/afile
create mode 120000 tests/bscs-merge.fail/dir.symb.out/systems/default
create mode 120000 tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/afile
create mode 120000 tests/bscs-merge.fail/regular.dir.in/systems/default
create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/factory/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.fail/regular.dir.out/systems/default
create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/factory/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.in/systems/default
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/factory/orig/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.out/systems/default
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/factory/orig/etc/1
create mode 120000 tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/afile
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/version2/orig/etc/1
create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/version2/run/etc/1
create mode 120000 tests/bscs-merge.pass/empty.in/systems/default
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-2
create mode 120000 tests/bscs-merge.pass/empty.out/systems/default
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1
create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2
create mode 120000 tests/bscs-merge.pass/sshconf.in/systems/default
create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/factory/orig/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/factory/run/etc/sshd_config
create mode 100644
tests/bscs-merge.pass/sshconf.in/systems/version2/orig/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/version2/run/etc/sshd_config
create mode 120000 tests/bscs-merge.pass/sshconf.out/systems/default
create mode 100644
tests/bscs-merge.pass/sshconf.out/systems/factory/orig/etc/sshd_config
create mode 100644 tests/bscs-merge.pass/sshconf.out/systems/factory/run/etc/sshd_config
create mode 100644
tests/bscs-merge.pass/sshconf.out/systems/version2/orig/etc/sshd_config
create mode 100644
tests/bscs-merge.pass/sshconf.out/systems/version2/run/etc/sshd_config
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/default
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vu
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/vuv2
create mode 100644 tests/bscs-merge.pass/symblinks.in/v1
create mode 100644 tests/bscs-merge.pass/symblinks.in/v2
create mode 100644 tests/bscs-merge.pass/symblinks.in/vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/default
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vuv2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v2
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vu
create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vuv2
create mode 100644 tests/bscs-merge.pass/symblinks.out/v1
create mode 100644 tests/bscs-merge.pass/symblinks.out/v2
create mode 100644 tests/bscs-merge.pass/symblinks.out/vu
create mode 120000 tests/bscs-merge.pass/upgrades.in/systems/default
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file1
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7.1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file2
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4
create mode 120000 tests/bscs-merge.pass/upgrades.out/systems/default
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7.1
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file2
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7.1
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file2
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file3
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file4
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file5
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file6
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.1
create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subfile1
create mode 100644
tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4
create mode 120000 tests/bscs-sync.in/systems/default
create mode 120000 tests/bscs-sync.in/systems/factory/orig/etc/config
create mode 100644 tests/bscs-sync.in/systems/factory/orig/etc/config1
create mode 100644 tests/bscs-sync.in/systems/factory/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/factory/run/etc/config
create mode 100644 tests/bscs-sync.in/systems/factory/run/etc/config1
create mode 100644 tests/bscs-sync.in/systems/factory/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/version2/orig/etc/config
create mode 100644 tests/bscs-sync.in/systems/version2/orig/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version2/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/version2/run/etc/config
create mode 100644 tests/bscs-sync.in/systems/version2/run/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version2/run/etc/folder1/config2
create mode 100644
tests/bscs-sync.in/systems/version2/run/etc/folder2/iamgoingbeoverwritten
create mode 120000 tests/bscs-sync.in/systems/version3/orig/etc/config
create mode 100644 tests/bscs-sync.in/systems/version3/orig/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version3/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.in/systems/version3/run/etc/config
create mode 100644 tests/bscs-sync.in/systems/version3/run/etc/config1
create mode 100644 tests/bscs-sync.in/systems/version3/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/default
create mode 120000 tests/bscs-sync.out/systems/factory/orig/etc/config
create mode 100644 tests/bscs-sync.out/systems/factory/orig/etc/config1
create mode 100644 tests/bscs-sync.out/systems/factory/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/factory/run/etc/config
create mode 100644 tests/bscs-sync.out/systems/factory/run/etc/config1
create mode 100644 tests/bscs-sync.out/systems/factory/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version2/orig/etc/config
create mode 100644 tests/bscs-sync.out/systems/version2/orig/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version2/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version2/run/etc/config
create mode 100644 tests/bscs-sync.out/systems/version2/run/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version2/run/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version3/orig/etc/config
create mode 100644 tests/bscs-sync.out/systems/version3/orig/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version3/orig/etc/folder1/config2
create mode 120000 tests/bscs-sync.out/systems/version3/run/etc/config
create mode 100644 tests/bscs-sync.out/systems/version3/run/etc/config1
create mode 100644 tests/bscs-sync.out/systems/version3/run/etc/folder1/config2
create mode 100755 tests/fake_mounting_script.sh
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1
deleted file mode 120000
index 6a93f4f..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1
+++ /dev/null
@@ -1 +0,0 @@
-afile
\ No newline at end of file
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile
deleted file mode 100644
index e69de29..0000000
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config
deleted file mode 100644
index 98fa27e..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config
+++ /dev/null
@@ -1,123 +0,0 @@
-# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
-
-# This is the sshd server system-wide configuration file. See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented. Uncommented options override the
-# default value.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-# The default requires explicit activation of protocol 1
-#Protocol 2
-
-# HostKey for protocol version 1
-#HostKey /etc/ssh/ssh_host_key
-# HostKeys for protocol version 2
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_dsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-
-# Lifetime and size of ephemeral version 1 server key
-#KeyRegenerationInterval 1h
-#ServerKeyBits 1024
-
-# Logging
-# obsoletes QuietMode and FascistLogging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-#PermitRootLogin yes
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#RSAAuthentication yes
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile .ssh/authorized_keys
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#RhostsRSAAuthentication no
-# similar for protocol version 2
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# RhostsRSAAuthentication and HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# To disable tunneled clear text passwords, change to no here!
-#PasswordAuthentication yes
-#PermitEmptyPasswords no
-
-# Change to no to disable s/key passwords
-#ChallengeResponseAuthentication yes
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'yes' to enable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the ChallengeResponseAuthentication and
-# PasswordAuthentication. Depending on your PAM configuration,
-# PAM authentication via ChallengeResponseAuthentication may bypass
-# the setting of "PermitRootLogin without-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and ChallengeResponseAuthentication to 'no'.
-#UsePAM no
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PrintMotd yes
-#PrintLastLog yes
-#TCPKeepAlive yes
-#UseLogin no
-#UsePrivilegeSeparation yes
-PermitUserEnvironment yes
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10
-#PermitTunnel no
-#ChrootDirectory none
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem sftp /usr/lib/openssh/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-# X11Forwarding no
-# AllowTcpForwarding no
-# ForceCommand cvs server
-
-AcceptEnv LANG LC_*
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config
deleted file mode 100644
index 4e6a5d3..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config
+++ /dev/null
@@ -1,123 +0,0 @@
-# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
-
-# This is the sshd server system-wide configuration file. See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented. Uncommented options override the
-# default value.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-# The default requires explicit activation of protocol 1
-#Protocol 2
-
-# HostKey for protocol version 1
-#HostKey /etc/ssh/ssh_host_key
-# HostKeys for protocol version 2
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_dsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-
-# Lifetime and size of ephemeral version 1 server key
-#KeyRegenerationInterval 1h
-#ServerKeyBits 1024
-
-# Logging
-# obsoletes QuietMode and FascistLogging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-#PermitRootLogin yes
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#RSAAuthentication yes
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile .ssh/authorized_keys
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#RhostsRSAAuthentication no
-# similar for protocol version 2
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# RhostsRSAAuthentication and HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# To disable tunneled clear text passwords, change to no here!
-#PasswordAuthentication yes
-#PermitEmptyPasswords no
-
-# Change to no to disable s/key passwords
-#ChallengeResponseAuthentication yes
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'yes' to enable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the ChallengeResponseAuthentication and
-# PasswordAuthentication. Depending on your PAM configuration,
-# PAM authentication via ChallengeResponseAuthentication may bypass
-# the setting of "PermitRootLogin without-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and ChallengeResponseAuthentication to 'no'.
-#UsePAM no
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PrintMotd yes
-#PrintLastLog yes
-#TCPKeepAlive yes
-#UseLogin no
-#UsePrivilegeSeparation yes
-PermitUserEnvironment yes
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10
-#PermitTunnel no
-ChrootDirectory none
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem sftp /usr/lib/openssh/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-# X11Forwarding no
-# AllowTcpForwarding no
-# ForceCommand cvs server
-
-AcceptEnv LANG LC_*
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config
deleted file mode 100644
index c4b25e9..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config
+++ /dev/null
@@ -1,123 +0,0 @@
-# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
-
-# This is the sshd server system-wide configuration file. See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented. Uncommented options override the
-# default value.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-# The default requires explicit activation of protocol 1
-#Protocol 2
-
-# HostKey for protocol version 1
-#HostKey /etc/ssh/ssh_host_key
-# HostKeys for protocol version 2
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_dsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-
-# Lifetime and size of ephemeral version 1 server key
-#KeyRegenerationInterval 1h
-#ServerKeyBits 1024
-
-# Logging
-# obsoletes QuietMode and FascistLogging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-#PermitRootLogin yes
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#RSAAuthentication yes
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile .ssh/authorized_keys
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#RhostsRSAAuthentication no
-# similar for protocol version 2
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# RhostsRSAAuthentication and HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# To disable tunneled clear text passwords, change to no here!
-#PasswordAuthentication yes
-#PermitEmptyPasswords no
-
-# Change to no to disable s/key passwords
-#ChallengeResponseAuthentication yes
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'yes' to enable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the ChallengeResponseAuthentication and
-# PasswordAuthentication. Depending on your PAM configuration,
-# PAM authentication via ChallengeResponseAuthentication may bypass
-# the setting of "PermitRootLogin without-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and ChallengeResponseAuthentication to 'no'.
-#UsePAM no
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PrintMotd yes
-#PrintLastLog yes
-#TCPKeepAlive yes
-UseLogin no
-#UsePrivilegeSeparation yes
-PermitUserEnvironment yes
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10
-#PermitTunnel no
-#ChrootDirectory none
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem sftp /usr/lib/openssh/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-# X11Forwarding no
-# AllowTcpForwarding no
-# ForceCommand cvs server
-
-AcceptEnv LANG LC_*
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1
deleted file mode 100644
index e69de29..0000000
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1
deleted file mode 100644
index e69de29..0000000
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1
deleted file mode 100644
index e69de29..0000000
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1
deleted file mode 100644
index e69de29..0000000
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1
deleted file mode 120000
index 6a93f4f..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1
+++ /dev/null
@@ -1 +0,0 @@
-afile
\ No newline at end of file
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile
deleted file mode 100644
index e69de29..0000000
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1
deleted file mode 120000
index d09a60b..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1
+++ /dev/null
@@ -1 +0,0 @@
-../v1f
\ No newline at end of file
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2
deleted file mode 120000
index d09a60b..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2
+++ /dev/null
@@ -1 +0,0 @@
-../v1f
\ No newline at end of file
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3
deleted file mode 120000
index d09a60b..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3
+++ /dev/null
@@ -1 +0,0 @@
-../v1f
\ No newline at end of file
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f
deleted file mode 100644
index e69de29..0000000
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1
deleted file mode 120000
index e4b01f1..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1
+++ /dev/null
@@ -1 +0,0 @@
-../v2f
\ No newline at end of file
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3
deleted file mode 120000
index e4b01f1..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3
+++ /dev/null
@@ -1 +0,0 @@
-../v2f
\ No newline at end of file
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4
deleted file mode 120000
index e4b01f1..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4
+++ /dev/null
@@ -1 +0,0 @@
-../v2f
\ No newline at end of file
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f
deleted file mode 100644
index e69de29..0000000
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1
deleted file mode 120000
index fcf9fc4..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1
+++ /dev/null
@@ -1 +0,0 @@
-../vuf
\ No newline at end of file
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2
deleted file mode 120000
index fcf9fc4..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2
+++ /dev/null
@@ -1 +0,0 @@
-../vuf
\ No newline at end of file
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4
deleted file mode 120000
index fcf9fc4..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4
+++ /dev/null
@@ -1 +0,0 @@
-../vuf
\ No newline at end of file
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf
b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf
deleted file mode 100644
index e69de29..0000000
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1
deleted file mode 100644
index b73be5d..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=v1
-version=v1
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4
deleted file mode 100644
index 9972a7a..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=v1,v2
-version=v1
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5
deleted file mode 100644
index 8fbeda2..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=v1,vu
-version=v1
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7
deleted file mode 100644
index 7c1f4fb..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=v1,vu,v2
-version=v1
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1
deleted file mode 100644
index d579e7b..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1
+++ /dev/null
@@ -1,8 +0,0 @@
-a=1
-b=2
-c=3
-whereami=v1,vu,v2
-version=v1
-d=1
-e=2
-f=3
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1
deleted file mode 100644
index 1cb075e..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1
+++ /dev/null
@@ -1,10 +0,0 @@
-qeq asda d
-s
-d
-a sd
-a
-d
-a
-d
-
-d
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4
deleted file mode 100644
index e69de29..0000000
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3
deleted file mode 100644
index b1580e3..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=vu
-version=v2
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4
deleted file mode 100644
index ebc4914..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=v1,v2
-version=v2
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6
deleted file mode 100644
index e76efb0..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=vu,v2
-version=v2
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7
deleted file mode 100644
index 93c46eb..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=v1,vu,v2
-version=v2
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1
deleted file mode 100644
index 2462a4f..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1
+++ /dev/null
@@ -1,8 +0,0 @@
-a=1
-b=2
-c=3
-whereami=v1,vu,v2
-version=v2
-d=1
-e=2
-f=3
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1
deleted file mode 100644
index 1cb075e..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1
+++ /dev/null
@@ -1,10 +0,0 @@
-qeq asda d
-s
-d
-a sd
-a
-d
-a
-d
-
-d
diff --git
a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4
deleted file mode 100644
index e69de29..0000000
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2
deleted file mode 100644
index 9fa9381..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=vu
-version=vu
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5
deleted file mode 100644
index eddf4ca..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=v1,vu
-version=vu
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6
deleted file mode 100644
index 9802a97..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=vu,v2
-version=vu
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7
b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7
deleted file mode 100644
index 24553ad..0000000
--- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7
+++ /dev/null
@@ -1,2 +0,0 @@
-whereami=v1,vu,v2
-version=vu
diff --git a/tests/bscs-merge.fail/dir.symb.in/systems/default
b/tests/bscs-merge.fail/dir.symb.in/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.fail/dir.symb.in/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/1
b/tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/1
new file mode 120000
index 0000000..6a93f4f
--- /dev/null
+++ b/tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/1
@@ -0,0 +1 @@
+afile
\ No newline at end of file
diff --git a/tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/afile
b/tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/afile
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/dir.symb.out/systems/default
b/tests/bscs-merge.fail/dir.symb.out/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.fail/dir.symb.out/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/1
b/tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/1
new file mode 120000
index 0000000..6a93f4f
--- /dev/null
+++ b/tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/1
@@ -0,0 +1 @@
+afile
\ No newline at end of file
diff --git a/tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/afile
b/tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/afile
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.dir.in/systems/default
b/tests/bscs-merge.fail/regular.dir.in/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.fail/regular.dir.in/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.fail/regular.dir.in/systems/factory/orig/etc/1
b/tests/bscs-merge.fail/regular.dir.in/systems/factory/orig/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.dir.in/systems/version2/orig/etc/1
b/tests/bscs-merge.fail/regular.dir.in/systems/version2/orig/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.dir.in/systems/version2/run/etc/1
b/tests/bscs-merge.fail/regular.dir.in/systems/version2/run/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.dir.out/systems/default
b/tests/bscs-merge.fail/regular.dir.out/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.fail/regular.dir.out/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.fail/regular.dir.out/systems/factory/orig/etc/1
b/tests/bscs-merge.fail/regular.dir.out/systems/factory/orig/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.dir.out/systems/version2/orig/etc/1
b/tests/bscs-merge.fail/regular.dir.out/systems/version2/orig/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.dir.out/systems/version2/run/etc/1
b/tests/bscs-merge.fail/regular.dir.out/systems/version2/run/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/default
b/tests/bscs-merge.fail/regular.symb.in/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.fail/regular.symb.in/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/factory/orig/etc/1
b/tests/bscs-merge.fail/regular.symb.in/systems/factory/orig/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1
b/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1
new file mode 120000
index 0000000..6a93f4f
--- /dev/null
+++ b/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1
@@ -0,0 +1 @@
+afile
\ No newline at end of file
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile
b/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/version2/orig/etc/1
b/tests/bscs-merge.fail/regular.symb.in/systems/version2/orig/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/version2/run/etc/1
b/tests/bscs-merge.fail/regular.symb.in/systems/version2/run/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.symb.out/systems/default
b/tests/bscs-merge.fail/regular.symb.out/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.fail/regular.symb.out/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.fail/regular.symb.out/systems/factory/orig/etc/1
b/tests/bscs-merge.fail/regular.symb.out/systems/factory/orig/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/1
b/tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/1
new file mode 120000
index 0000000..6a93f4f
--- /dev/null
+++ b/tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/1
@@ -0,0 +1 @@
+afile
\ No newline at end of file
diff --git a/tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/afile
b/tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/afile
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.symb.out/systems/version2/orig/etc/1
b/tests/bscs-merge.fail/regular.symb.out/systems/version2/orig/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.fail/regular.symb.out/systems/version2/run/etc/1
b/tests/bscs-merge.fail/regular.symb.out/systems/version2/run/etc/1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.in/systems/default
b/tests/bscs-merge.pass/empty.in/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-1
b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-2
b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-2
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-2
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-1
b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-2
b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-2
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vuv2-1
b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-1
b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-2
b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-2
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-2
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vuv2-1
b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-1
b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-2
b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-2
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-2
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-1
b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-2
b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-2
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1vuv2-1
b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-1
b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-2
b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-2
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-1
b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-2
b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-2
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1vuv2-1
b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-1
b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-2
b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-2
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.out/systems/default
b/tests/bscs-merge.pass/empty.out/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-1
b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-2
b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-2
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-2
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-1
b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-2
b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-2
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vuv2-1
b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-1
b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-2
b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-2
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-2
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vuv2-1
b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-1
b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-2
b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-2
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-2
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1
b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2
b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1
b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1
b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2
b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1
b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2
b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1
b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2
b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1
b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1
b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2
b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2
new file mode 100644
index 0000000..a7f8d9e
--- /dev/null
+++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2
@@ -0,0 +1 @@
+bla
diff --git a/tests/bscs-merge.pass/sshconf.in/systems/default
b/tests/bscs-merge.pass/sshconf.in/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.pass/sshconf.in/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/sshconf.in/systems/factory/orig/etc/sshd_config
b/tests/bscs-merge.pass/sshconf.in/systems/factory/orig/etc/sshd_config
new file mode 100644
index 0000000..98fa27e
--- /dev/null
+++ b/tests/bscs-merge.pass/sshconf.in/systems/factory/orig/etc/sshd_config
@@ -0,0 +1,123 @@
+# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
+
+# This is the sshd server system-wide configuration file. See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented. Uncommented options override the
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+# The default requires explicit activation of protocol 1
+#Protocol 2
+
+# HostKey for protocol version 1
+#HostKey /etc/ssh/ssh_host_key
+# HostKeys for protocol version 2
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+
+# Lifetime and size of ephemeral version 1 server key
+#KeyRegenerationInterval 1h
+#ServerKeyBits 1024
+
+# Logging
+# obsoletes QuietMode and FascistLogging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+#PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#RSAAuthentication yes
+#PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile .ssh/authorized_keys
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#RhostsRSAAuthentication no
+# similar for protocol version 2
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# RhostsRSAAuthentication and HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication. Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+#UsePAM no
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PrintMotd yes
+#PrintLastLog yes
+#TCPKeepAlive yes
+#UseLogin no
+#UsePrivilegeSeparation yes
+PermitUserEnvironment yes
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS yes
+#PidFile /var/run/sshd.pid
+#MaxStartups 10
+#PermitTunnel no
+#ChrootDirectory none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+# X11Forwarding no
+# AllowTcpForwarding no
+# ForceCommand cvs server
+
+AcceptEnv LANG LC_*
diff --git a/tests/bscs-merge.pass/sshconf.in/systems/factory/run/etc/sshd_config
b/tests/bscs-merge.pass/sshconf.in/systems/factory/run/etc/sshd_config
new file mode 100644
index 0000000..c4b25e9
--- /dev/null
+++ b/tests/bscs-merge.pass/sshconf.in/systems/factory/run/etc/sshd_config
@@ -0,0 +1,123 @@
+# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
+
+# This is the sshd server system-wide configuration file. See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented. Uncommented options override the
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+# The default requires explicit activation of protocol 1
+#Protocol 2
+
+# HostKey for protocol version 1
+#HostKey /etc/ssh/ssh_host_key
+# HostKeys for protocol version 2
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+
+# Lifetime and size of ephemeral version 1 server key
+#KeyRegenerationInterval 1h
+#ServerKeyBits 1024
+
+# Logging
+# obsoletes QuietMode and FascistLogging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+#PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#RSAAuthentication yes
+#PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile .ssh/authorized_keys
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#RhostsRSAAuthentication no
+# similar for protocol version 2
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# RhostsRSAAuthentication and HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication. Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+#UsePAM no
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PrintMotd yes
+#PrintLastLog yes
+#TCPKeepAlive yes
+UseLogin no
+#UsePrivilegeSeparation yes
+PermitUserEnvironment yes
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS yes
+#PidFile /var/run/sshd.pid
+#MaxStartups 10
+#PermitTunnel no
+#ChrootDirectory none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+# X11Forwarding no
+# AllowTcpForwarding no
+# ForceCommand cvs server
+
+AcceptEnv LANG LC_*
diff --git a/tests/bscs-merge.pass/sshconf.in/systems/version2/orig/etc/sshd_config
b/tests/bscs-merge.pass/sshconf.in/systems/version2/orig/etc/sshd_config
new file mode 100644
index 0000000..4e6a5d3
--- /dev/null
+++ b/tests/bscs-merge.pass/sshconf.in/systems/version2/orig/etc/sshd_config
@@ -0,0 +1,123 @@
+# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
+
+# This is the sshd server system-wide configuration file. See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented. Uncommented options override the
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+# The default requires explicit activation of protocol 1
+#Protocol 2
+
+# HostKey for protocol version 1
+#HostKey /etc/ssh/ssh_host_key
+# HostKeys for protocol version 2
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+
+# Lifetime and size of ephemeral version 1 server key
+#KeyRegenerationInterval 1h
+#ServerKeyBits 1024
+
+# Logging
+# obsoletes QuietMode and FascistLogging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+#PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#RSAAuthentication yes
+#PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile .ssh/authorized_keys
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#RhostsRSAAuthentication no
+# similar for protocol version 2
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# RhostsRSAAuthentication and HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication. Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+#UsePAM no
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PrintMotd yes
+#PrintLastLog yes
+#TCPKeepAlive yes
+#UseLogin no
+#UsePrivilegeSeparation yes
+PermitUserEnvironment yes
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS yes
+#PidFile /var/run/sshd.pid
+#MaxStartups 10
+#PermitTunnel no
+ChrootDirectory none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+# X11Forwarding no
+# AllowTcpForwarding no
+# ForceCommand cvs server
+
+AcceptEnv LANG LC_*
diff --git a/tests/bscs-merge.pass/sshconf.in/systems/version2/run/etc/sshd_config
b/tests/bscs-merge.pass/sshconf.in/systems/version2/run/etc/sshd_config
new file mode 100644
index 0000000..4e6a5d3
--- /dev/null
+++ b/tests/bscs-merge.pass/sshconf.in/systems/version2/run/etc/sshd_config
@@ -0,0 +1,123 @@
+# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
+
+# This is the sshd server system-wide configuration file. See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented. Uncommented options override the
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+# The default requires explicit activation of protocol 1
+#Protocol 2
+
+# HostKey for protocol version 1
+#HostKey /etc/ssh/ssh_host_key
+# HostKeys for protocol version 2
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+
+# Lifetime and size of ephemeral version 1 server key
+#KeyRegenerationInterval 1h
+#ServerKeyBits 1024
+
+# Logging
+# obsoletes QuietMode and FascistLogging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+#PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#RSAAuthentication yes
+#PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile .ssh/authorized_keys
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#RhostsRSAAuthentication no
+# similar for protocol version 2
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# RhostsRSAAuthentication and HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication. Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+#UsePAM no
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PrintMotd yes
+#PrintLastLog yes
+#TCPKeepAlive yes
+#UseLogin no
+#UsePrivilegeSeparation yes
+PermitUserEnvironment yes
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS yes
+#PidFile /var/run/sshd.pid
+#MaxStartups 10
+#PermitTunnel no
+ChrootDirectory none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+# X11Forwarding no
+# AllowTcpForwarding no
+# ForceCommand cvs server
+
+AcceptEnv LANG LC_*
diff --git a/tests/bscs-merge.pass/sshconf.out/systems/default
b/tests/bscs-merge.pass/sshconf.out/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.pass/sshconf.out/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/sshconf.out/systems/factory/orig/etc/sshd_config
b/tests/bscs-merge.pass/sshconf.out/systems/factory/orig/etc/sshd_config
new file mode 100644
index 0000000..98fa27e
--- /dev/null
+++ b/tests/bscs-merge.pass/sshconf.out/systems/factory/orig/etc/sshd_config
@@ -0,0 +1,123 @@
+# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
+
+# This is the sshd server system-wide configuration file. See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented. Uncommented options override the
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+# The default requires explicit activation of protocol 1
+#Protocol 2
+
+# HostKey for protocol version 1
+#HostKey /etc/ssh/ssh_host_key
+# HostKeys for protocol version 2
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+
+# Lifetime and size of ephemeral version 1 server key
+#KeyRegenerationInterval 1h
+#ServerKeyBits 1024
+
+# Logging
+# obsoletes QuietMode and FascistLogging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+#PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#RSAAuthentication yes
+#PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile .ssh/authorized_keys
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#RhostsRSAAuthentication no
+# similar for protocol version 2
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# RhostsRSAAuthentication and HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication. Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+#UsePAM no
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PrintMotd yes
+#PrintLastLog yes
+#TCPKeepAlive yes
+#UseLogin no
+#UsePrivilegeSeparation yes
+PermitUserEnvironment yes
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS yes
+#PidFile /var/run/sshd.pid
+#MaxStartups 10
+#PermitTunnel no
+#ChrootDirectory none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+# X11Forwarding no
+# AllowTcpForwarding no
+# ForceCommand cvs server
+
+AcceptEnv LANG LC_*
diff --git a/tests/bscs-merge.pass/sshconf.out/systems/factory/run/etc/sshd_config
b/tests/bscs-merge.pass/sshconf.out/systems/factory/run/etc/sshd_config
new file mode 100644
index 0000000..c4b25e9
--- /dev/null
+++ b/tests/bscs-merge.pass/sshconf.out/systems/factory/run/etc/sshd_config
@@ -0,0 +1,123 @@
+# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
+
+# This is the sshd server system-wide configuration file. See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented. Uncommented options override the
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+# The default requires explicit activation of protocol 1
+#Protocol 2
+
+# HostKey for protocol version 1
+#HostKey /etc/ssh/ssh_host_key
+# HostKeys for protocol version 2
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+
+# Lifetime and size of ephemeral version 1 server key
+#KeyRegenerationInterval 1h
+#ServerKeyBits 1024
+
+# Logging
+# obsoletes QuietMode and FascistLogging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+#PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#RSAAuthentication yes
+#PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile .ssh/authorized_keys
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#RhostsRSAAuthentication no
+# similar for protocol version 2
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# RhostsRSAAuthentication and HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication. Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+#UsePAM no
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PrintMotd yes
+#PrintLastLog yes
+#TCPKeepAlive yes
+UseLogin no
+#UsePrivilegeSeparation yes
+PermitUserEnvironment yes
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS yes
+#PidFile /var/run/sshd.pid
+#MaxStartups 10
+#PermitTunnel no
+#ChrootDirectory none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+# X11Forwarding no
+# AllowTcpForwarding no
+# ForceCommand cvs server
+
+AcceptEnv LANG LC_*
diff --git a/tests/bscs-merge.pass/sshconf.out/systems/version2/orig/etc/sshd_config
b/tests/bscs-merge.pass/sshconf.out/systems/version2/orig/etc/sshd_config
new file mode 100644
index 0000000..4e6a5d3
--- /dev/null
+++ b/tests/bscs-merge.pass/sshconf.out/systems/version2/orig/etc/sshd_config
@@ -0,0 +1,123 @@
+# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
+
+# This is the sshd server system-wide configuration file. See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented. Uncommented options override the
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+# The default requires explicit activation of protocol 1
+#Protocol 2
+
+# HostKey for protocol version 1
+#HostKey /etc/ssh/ssh_host_key
+# HostKeys for protocol version 2
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+
+# Lifetime and size of ephemeral version 1 server key
+#KeyRegenerationInterval 1h
+#ServerKeyBits 1024
+
+# Logging
+# obsoletes QuietMode and FascistLogging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+#PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#RSAAuthentication yes
+#PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile .ssh/authorized_keys
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#RhostsRSAAuthentication no
+# similar for protocol version 2
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# RhostsRSAAuthentication and HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication. Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+#UsePAM no
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PrintMotd yes
+#PrintLastLog yes
+#TCPKeepAlive yes
+#UseLogin no
+#UsePrivilegeSeparation yes
+PermitUserEnvironment yes
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS yes
+#PidFile /var/run/sshd.pid
+#MaxStartups 10
+#PermitTunnel no
+ChrootDirectory none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+# X11Forwarding no
+# AllowTcpForwarding no
+# ForceCommand cvs server
+
+AcceptEnv LANG LC_*
diff --git a/tests/bscs-merge.pass/sshconf.out/systems/version2/run/etc/sshd_config
b/tests/bscs-merge.pass/sshconf.out/systems/version2/run/etc/sshd_config
new file mode 100644
index 0000000..469d4f5
--- /dev/null
+++ b/tests/bscs-merge.pass/sshconf.out/systems/version2/run/etc/sshd_config
@@ -0,0 +1,123 @@
+# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
+
+# This is the sshd server system-wide configuration file. See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented. Uncommented options override the
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+# The default requires explicit activation of protocol 1
+#Protocol 2
+
+# HostKey for protocol version 1
+#HostKey /etc/ssh/ssh_host_key
+# HostKeys for protocol version 2
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+
+# Lifetime and size of ephemeral version 1 server key
+#KeyRegenerationInterval 1h
+#ServerKeyBits 1024
+
+# Logging
+# obsoletes QuietMode and FascistLogging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+#PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#RSAAuthentication yes
+#PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile .ssh/authorized_keys
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#RhostsRSAAuthentication no
+# similar for protocol version 2
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# RhostsRSAAuthentication and HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication. Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+#UsePAM no
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PrintMotd yes
+#PrintLastLog yes
+#TCPKeepAlive yes
+UseLogin no
+#UsePrivilegeSeparation yes
+PermitUserEnvironment yes
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS yes
+#PidFile /var/run/sshd.pid
+#MaxStartups 10
+#PermitTunnel no
+ChrootDirectory none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+# X11Forwarding no
+# AllowTcpForwarding no
+# ForceCommand cvs server
+
+AcceptEnv LANG LC_*
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/default
b/tests/bscs-merge.pass/symblinks.in/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1
b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1
new file mode 120000
index 0000000..446ec55
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1
@@ -0,0 +1 @@
+../../../../v1
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1v2
b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1v2
new file mode 120000
index 0000000..446ec55
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1v2
@@ -0,0 +1 @@
+../../../../v1
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vu
b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vu
new file mode 120000
index 0000000..446ec55
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vu
@@ -0,0 +1 @@
+../../../../v1
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vuv2
b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vuv2
new file mode 120000
index 0000000..446ec55
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vuv2
@@ -0,0 +1 @@
+../../../../v1
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vu
b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vu
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vu
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vuv2
b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vuv2
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vuv2
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vu
b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vu
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vu
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vuv2
b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vuv2
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vuv2
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1v2
b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1v2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1v2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1vuv2
b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1vuv2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1vuv2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v2
b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/vuv2
b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/vuv2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/vuv2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1v2
b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1v2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1v2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1vuv2
b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1vuv2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1vuv2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v2
b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/vuv2
b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/vuv2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/vuv2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/v1
b/tests/bscs-merge.pass/symblinks.in/v1
new file mode 100644
index 0000000..626799f
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/v1
@@ -0,0 +1 @@
+v1
diff --git a/tests/bscs-merge.pass/symblinks.in/v2
b/tests/bscs-merge.pass/symblinks.in/v2
new file mode 100644
index 0000000..8c1384d
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/v2
@@ -0,0 +1 @@
+v2
diff --git a/tests/bscs-merge.pass/symblinks.in/vu
b/tests/bscs-merge.pass/symblinks.in/vu
new file mode 100644
index 0000000..4782f39
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/vu
@@ -0,0 +1 @@
+vu
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/default
b/tests/bscs-merge.pass/symblinks.out/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1
b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1
new file mode 120000
index 0000000..446ec55
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1
@@ -0,0 +1 @@
+../../../../v1
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1v2
b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1v2
new file mode 120000
index 0000000..446ec55
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1v2
@@ -0,0 +1 @@
+../../../../v1
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vu
b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vu
new file mode 120000
index 0000000..446ec55
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vu
@@ -0,0 +1 @@
+../../../../v1
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vuv2
b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vuv2
new file mode 120000
index 0000000..446ec55
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vuv2
@@ -0,0 +1 @@
+../../../../v1
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vu
b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vu
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vu
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vuv2
b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vuv2
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vuv2
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vu
b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vu
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vu
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vuv2
b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vuv2
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vuv2
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1v2
b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1v2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1v2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1vuv2
b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1vuv2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1vuv2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v2
b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/vuv2
b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/vuv2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/vuv2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1
b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1
new file mode 120000
index 0000000..446ec55
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1
@@ -0,0 +1 @@
+../../../../v1
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1v2
b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1v2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1v2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vu
b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vu
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vu
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vuv2
b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vuv2
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vuv2
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v2
b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v2
new file mode 120000
index 0000000..e403242
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v2
@@ -0,0 +1 @@
+../../../../v2
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vu
b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vu
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vu
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vuv2
b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vuv2
new file mode 120000
index 0000000..2abd9b7
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vuv2
@@ -0,0 +1 @@
+../../../../vu
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/v1
b/tests/bscs-merge.pass/symblinks.out/v1
new file mode 100644
index 0000000..626799f
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/v1
@@ -0,0 +1 @@
+v1
diff --git a/tests/bscs-merge.pass/symblinks.out/v2
b/tests/bscs-merge.pass/symblinks.out/v2
new file mode 100644
index 0000000..8c1384d
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/v2
@@ -0,0 +1 @@
+v2
diff --git a/tests/bscs-merge.pass/symblinks.out/vu
b/tests/bscs-merge.pass/symblinks.out/vu
new file mode 100644
index 0000000..4782f39
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/vu
@@ -0,0 +1 @@
+vu
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/default
b/tests/bscs-merge.pass/upgrades.in/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file1
b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file1
new file mode 100644
index 0000000..b73be5d
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file1
@@ -0,0 +1,2 @@
+whereami=v1
+version=v1
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file4
b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file4
new file mode 100644
index 0000000..9972a7a
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file4
@@ -0,0 +1,2 @@
+whereami=v1,v2
+version=v1
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file5
b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file5
new file mode 100644
index 0000000..8fbeda2
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file5
@@ -0,0 +1,2 @@
+whereami=v1,vu
+version=v1
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7
b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7
new file mode 100644
index 0000000..7c1f4fb
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7
@@ -0,0 +1,2 @@
+whereami=v1,vu,v2
+version=v1
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7.1
b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7.1
new file mode 100644
index 0000000..d579e7b
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7.1
@@ -0,0 +1,8 @@
+a=1
+b=2
+c=3
+whereami=v1,vu,v2
+version=v1
+d=1
+e=2
+f=3
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subfile1
b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subfile1
new file mode 100644
index 0000000..1cb075e
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/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.in/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4
b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file2
b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file2
new file mode 100644
index 0000000..9fa9381
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file2
@@ -0,0 +1,2 @@
+whereami=vu
+version=vu
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file5
b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file5
new file mode 100644
index 0000000..eddf4ca
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file5
@@ -0,0 +1,2 @@
+whereami=v1,vu
+version=vu
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file6
b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file6
new file mode 100644
index 0000000..9802a97
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file6
@@ -0,0 +1,2 @@
+whereami=vu,v2
+version=vu
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file7
b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file7
new file mode 100644
index 0000000..24553ad
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file7
@@ -0,0 +1,2 @@
+whereami=v1,vu,v2
+version=vu
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3
b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3
new file mode 100644
index 0000000..b1580e3
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3
@@ -0,0 +1,2 @@
+whereami=vu
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4
b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4
new file mode 100644
index 0000000..ebc4914
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4
@@ -0,0 +1,2 @@
+whereami=v1,v2
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6
b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6
new file mode 100644
index 0000000..e76efb0
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6
@@ -0,0 +1,2 @@
+whereami=vu,v2
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7
b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7
new file mode 100644
index 0000000..93c46eb
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7
@@ -0,0 +1,2 @@
+whereami=v1,vu,v2
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1
b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1
new file mode 100644
index 0000000..2462a4f
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/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.in/systems/version2/orig/etc/subdir1/subfile1
b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subfile1
new file mode 100644
index 0000000..1cb075e
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/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.in/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4
b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3
b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3
new file mode 100644
index 0000000..b1580e3
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3
@@ -0,0 +1,2 @@
+whereami=vu
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4
b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4
new file mode 100644
index 0000000..ebc4914
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4
@@ -0,0 +1,2 @@
+whereami=v1,v2
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6
b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6
new file mode 100644
index 0000000..e76efb0
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6
@@ -0,0 +1,2 @@
+whereami=vu,v2
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7
b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7
new file mode 100644
index 0000000..93c46eb
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7
@@ -0,0 +1,2 @@
+whereami=v1,vu,v2
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1
b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1
new file mode 100644
index 0000000..2462a4f
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/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.in/systems/version2/run/etc/subdir1/subfile1
b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subfile1
new file mode 100644
index 0000000..1cb075e
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.in/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.in/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4
b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/default
b/tests/bscs-merge.pass/upgrades.out/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file1
b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file1
new file mode 100644
index 0000000..b73be5d
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file1
@@ -0,0 +1,2 @@
+whereami=v1
+version=v1
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file4
b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file4
new file mode 100644
index 0000000..9972a7a
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file4
@@ -0,0 +1,2 @@
+whereami=v1,v2
+version=v1
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file5
b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file5
new file mode 100644
index 0000000..8fbeda2
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file5
@@ -0,0 +1,2 @@
+whereami=v1,vu
+version=v1
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7
b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7
new file mode 100644
index 0000000..7c1f4fb
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7
@@ -0,0 +1,2 @@
+whereami=v1,vu,v2
+version=v1
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7.1
b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7.1
new file mode 100644
index 0000000..d579e7b
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7.1
@@ -0,0 +1,8 @@
+a=1
+b=2
+c=3
+whereami=v1,vu,v2
+version=v1
+d=1
+e=2
+f=3
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subfile1
b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subfile1
new file mode 100644
index 0000000..1cb075e
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/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/factory/orig/etc/subdir1/subsubdir2/subsubfile4
b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file2
b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file2
new file mode 100644
index 0000000..9fa9381
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file2
@@ -0,0 +1,2 @@
+whereami=vu
+version=vu
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file5
b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file5
new file mode 100644
index 0000000..eddf4ca
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file5
@@ -0,0 +1,2 @@
+whereami=v1,vu
+version=vu
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file6
b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file6
new file mode 100644
index 0000000..9802a97
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file6
@@ -0,0 +1,2 @@
+whereami=vu,v2
+version=vu
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file7
b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file7
new file mode 100644
index 0000000..24553ad
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file7
@@ -0,0 +1,2 @@
+whereami=v1,vu,v2
+version=vu
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file3
b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file3
new file mode 100644
index 0000000..b1580e3
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file3
@@ -0,0 +1,2 @@
+whereami=vu
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file4
b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file4
new file mode 100644
index 0000000..ebc4914
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file4
@@ -0,0 +1,2 @@
+whereami=v1,v2
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file6
b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file6
new file mode 100644
index 0000000..e76efb0
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file6
@@ -0,0 +1,2 @@
+whereami=vu,v2
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7
b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7
new file mode 100644
index 0000000..93c46eb
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7
@@ -0,0 +1,2 @@
+whereami=v1,vu,v2
+version=v2
diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7.1
b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7.1
new file mode 100644
index 0000000..2462a4f
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/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/orig/etc/subdir1/subfile1
b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subfile1
new file mode 100644
index 0000000..1cb075e
--- /dev/null
+++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/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/orig/etc/subdir1/subsubdir2/subsubfile4
b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4
new file mode 100644
index 0000000..e69de29
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
diff --git a/tests/bscs-sync.in/systems/default b/tests/bscs-sync.in/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-sync.in/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-sync.in/systems/factory/orig/etc/config
b/tests/bscs-sync.in/systems/factory/orig/etc/config
new file mode 120000
index 0000000..a3161f3
--- /dev/null
+++ b/tests/bscs-sync.in/systems/factory/orig/etc/config
@@ -0,0 +1 @@
+config1
\ No newline at end of file
diff --git a/tests/bscs-sync.in/systems/factory/orig/etc/config1
b/tests/bscs-sync.in/systems/factory/orig/etc/config1
new file mode 100644
index 0000000..639916d
--- /dev/null
+++ b/tests/bscs-sync.in/systems/factory/orig/etc/config1
@@ -0,0 +1,2 @@
+config1
+factory/orig
diff --git a/tests/bscs-sync.in/systems/factory/orig/etc/folder1/config2
b/tests/bscs-sync.in/systems/factory/orig/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.in/systems/factory/orig/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/bscs-sync.in/systems/factory/run/etc/config
b/tests/bscs-sync.in/systems/factory/run/etc/config
new file mode 120000
index 0000000..a3161f3
--- /dev/null
+++ b/tests/bscs-sync.in/systems/factory/run/etc/config
@@ -0,0 +1 @@
+config1
\ No newline at end of file
diff --git a/tests/bscs-sync.in/systems/factory/run/etc/config1
b/tests/bscs-sync.in/systems/factory/run/etc/config1
new file mode 100644
index 0000000..5371fca
--- /dev/null
+++ b/tests/bscs-sync.in/systems/factory/run/etc/config1
@@ -0,0 +1,3 @@
+config1
+factory/orig
+user change!!
diff --git a/tests/bscs-sync.in/systems/factory/run/etc/folder1/config2
b/tests/bscs-sync.in/systems/factory/run/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.in/systems/factory/run/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/bscs-sync.in/systems/version2/orig/etc/config
b/tests/bscs-sync.in/systems/version2/orig/etc/config
new file mode 120000
index 0000000..a3161f3
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version2/orig/etc/config
@@ -0,0 +1 @@
+config1
\ No newline at end of file
diff --git a/tests/bscs-sync.in/systems/version2/orig/etc/config1
b/tests/bscs-sync.in/systems/version2/orig/etc/config1
new file mode 100644
index 0000000..639916d
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version2/orig/etc/config1
@@ -0,0 +1,2 @@
+config1
+factory/orig
diff --git a/tests/bscs-sync.in/systems/version2/orig/etc/folder1/config2
b/tests/bscs-sync.in/systems/version2/orig/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version2/orig/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/bscs-sync.in/systems/version2/run/etc/config
b/tests/bscs-sync.in/systems/version2/run/etc/config
new file mode 120000
index 0000000..a3161f3
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version2/run/etc/config
@@ -0,0 +1 @@
+config1
\ No newline at end of file
diff --git a/tests/bscs-sync.in/systems/version2/run/etc/config1
b/tests/bscs-sync.in/systems/version2/run/etc/config1
new file mode 100644
index 0000000..5371fca
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version2/run/etc/config1
@@ -0,0 +1,3 @@
+config1
+factory/orig
+user change!!
diff --git a/tests/bscs-sync.in/systems/version2/run/etc/folder1/config2
b/tests/bscs-sync.in/systems/version2/run/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version2/run/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/bscs-sync.in/systems/version2/run/etc/folder2/iamgoingbeoverwritten
b/tests/bscs-sync.in/systems/version2/run/etc/folder2/iamgoingbeoverwritten
new file mode 100644
index 0000000..e69de29
diff --git a/tests/bscs-sync.in/systems/version3/orig/etc/config
b/tests/bscs-sync.in/systems/version3/orig/etc/config
new file mode 120000
index 0000000..a3161f3
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version3/orig/etc/config
@@ -0,0 +1 @@
+config1
\ No newline at end of file
diff --git a/tests/bscs-sync.in/systems/version3/orig/etc/config1
b/tests/bscs-sync.in/systems/version3/orig/etc/config1
new file mode 100644
index 0000000..639916d
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version3/orig/etc/config1
@@ -0,0 +1,2 @@
+config1
+factory/orig
diff --git a/tests/bscs-sync.in/systems/version3/orig/etc/folder1/config2
b/tests/bscs-sync.in/systems/version3/orig/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version3/orig/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/bscs-sync.in/systems/version3/run/etc/config
b/tests/bscs-sync.in/systems/version3/run/etc/config
new file mode 120000
index 0000000..9211844
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version3/run/etc/config
@@ -0,0 +1 @@
+folder1/config2
\ No newline at end of file
diff --git a/tests/bscs-sync.in/systems/version3/run/etc/config1
b/tests/bscs-sync.in/systems/version3/run/etc/config1
new file mode 100644
index 0000000..5371fca
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version3/run/etc/config1
@@ -0,0 +1,3 @@
+config1
+factory/orig
+user change!!
diff --git a/tests/bscs-sync.in/systems/version3/run/etc/folder1/config2
b/tests/bscs-sync.in/systems/version3/run/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.in/systems/version3/run/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/bscs-sync.out/systems/default b/tests/bscs-sync.out/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-sync.out/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-sync.out/systems/factory/orig/etc/config
b/tests/bscs-sync.out/systems/factory/orig/etc/config
new file mode 120000
index 0000000..a3161f3
--- /dev/null
+++ b/tests/bscs-sync.out/systems/factory/orig/etc/config
@@ -0,0 +1 @@
+config1
\ No newline at end of file
diff --git a/tests/bscs-sync.out/systems/factory/orig/etc/config1
b/tests/bscs-sync.out/systems/factory/orig/etc/config1
new file mode 100644
index 0000000..639916d
--- /dev/null
+++ b/tests/bscs-sync.out/systems/factory/orig/etc/config1
@@ -0,0 +1,2 @@
+config1
+factory/orig
diff --git a/tests/bscs-sync.out/systems/factory/orig/etc/folder1/config2
b/tests/bscs-sync.out/systems/factory/orig/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.out/systems/factory/orig/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/bscs-sync.out/systems/factory/run/etc/config
b/tests/bscs-sync.out/systems/factory/run/etc/config
new file mode 120000
index 0000000..9211844
--- /dev/null
+++ b/tests/bscs-sync.out/systems/factory/run/etc/config
@@ -0,0 +1 @@
+folder1/config2
\ No newline at end of file
diff --git a/tests/bscs-sync.out/systems/factory/run/etc/config1
b/tests/bscs-sync.out/systems/factory/run/etc/config1
new file mode 100644
index 0000000..5371fca
--- /dev/null
+++ b/tests/bscs-sync.out/systems/factory/run/etc/config1
@@ -0,0 +1,3 @@
+config1
+factory/orig
+user change!!
diff --git a/tests/bscs-sync.out/systems/factory/run/etc/folder1/config2
b/tests/bscs-sync.out/systems/factory/run/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.out/systems/factory/run/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/bscs-sync.out/systems/version2/orig/etc/config
b/tests/bscs-sync.out/systems/version2/orig/etc/config
new file mode 120000
index 0000000..a3161f3
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version2/orig/etc/config
@@ -0,0 +1 @@
+config1
\ No newline at end of file
diff --git a/tests/bscs-sync.out/systems/version2/orig/etc/config1
b/tests/bscs-sync.out/systems/version2/orig/etc/config1
new file mode 100644
index 0000000..639916d
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version2/orig/etc/config1
@@ -0,0 +1,2 @@
+config1
+factory/orig
diff --git a/tests/bscs-sync.out/systems/version2/orig/etc/folder1/config2
b/tests/bscs-sync.out/systems/version2/orig/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version2/orig/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/bscs-sync.out/systems/version2/run/etc/config
b/tests/bscs-sync.out/systems/version2/run/etc/config
new file mode 120000
index 0000000..9211844
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version2/run/etc/config
@@ -0,0 +1 @@
+folder1/config2
\ No newline at end of file
diff --git a/tests/bscs-sync.out/systems/version2/run/etc/config1
b/tests/bscs-sync.out/systems/version2/run/etc/config1
new file mode 100644
index 0000000..5371fca
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version2/run/etc/config1
@@ -0,0 +1,3 @@
+config1
+factory/orig
+user change!!
diff --git a/tests/bscs-sync.out/systems/version2/run/etc/folder1/config2
b/tests/bscs-sync.out/systems/version2/run/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version2/run/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/bscs-sync.out/systems/version3/orig/etc/config
b/tests/bscs-sync.out/systems/version3/orig/etc/config
new file mode 120000
index 0000000..a3161f3
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version3/orig/etc/config
@@ -0,0 +1 @@
+config1
\ No newline at end of file
diff --git a/tests/bscs-sync.out/systems/version3/orig/etc/config1
b/tests/bscs-sync.out/systems/version3/orig/etc/config1
new file mode 100644
index 0000000..639916d
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version3/orig/etc/config1
@@ -0,0 +1,2 @@
+config1
+factory/orig
diff --git a/tests/bscs-sync.out/systems/version3/orig/etc/folder1/config2
b/tests/bscs-sync.out/systems/version3/orig/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version3/orig/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/bscs-sync.out/systems/version3/run/etc/config
b/tests/bscs-sync.out/systems/version3/run/etc/config
new file mode 120000
index 0000000..9211844
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version3/run/etc/config
@@ -0,0 +1 @@
+folder1/config2
\ No newline at end of file
diff --git a/tests/bscs-sync.out/systems/version3/run/etc/config1
b/tests/bscs-sync.out/systems/version3/run/etc/config1
new file mode 100644
index 0000000..5371fca
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version3/run/etc/config1
@@ -0,0 +1,3 @@
+config1
+factory/orig
+user change!!
diff --git a/tests/bscs-sync.out/systems/version3/run/etc/folder1/config2
b/tests/bscs-sync.out/systems/version3/run/etc/folder1/config2
new file mode 100644
index 0000000..88ef2e3
--- /dev/null
+++ b/tests/bscs-sync.out/systems/version3/run/etc/folder1/config2
@@ -0,0 +1,2 @@
+config2
+factory/orig
diff --git a/tests/fake_mounting_script.sh b/tests/fake_mounting_script.sh
new file mode 100755
index 0000000..4bb95f6
--- /dev/null
+++ b/tests/fake_mounting_script.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Copyright (c) 2013 Codethink Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License Version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+set -eu
+
+
+usage() {
+ echo usage: "$(basename $0) fake_mounting_point" >&2
+ exit 1
+}
+
+
+
+if [ "$#" != 1 ]; then
+ usage $0
+fi
+
+
+fake_mounting_point="$1"
+
+cp -a "$mounting_script_test_dir"/* "$fake_mounting_point"
+
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 21df2b2..8ae5d14 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -18,13 +18,78 @@ for i in [0-9][0-9]*.sh
do
cd $ALLTESTSDIR
echo "#### Running $i"
- fakeroot -- ./$i ../tbdiff-create/tbdiff-create ../tbdiff-deploy/tbdiff-deploy
+ ./$i ../tbdiff-create/tbdiff-create ../tbdiff-deploy/tbdiff-deploy
if [ $? -ne 0 ]
then
echo "Test program $i failed" 1>&2
cd $ALLTESTSDIR
echo "-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-"
- exit 1
+ #exit 1
fi
echo "#####################################################################"
done
+
+
+echo "Starting baserock-system-config-sync tests"
+merge_pass_folder="bscs-merge.pass"
+merge_fail_folder="bscs-merge.fail"
+sync_folder="bscs-sync"
+bscs_script="../baserock-system-config-sync/baserock-system-config-sync"
+bscs_log="bscs.log"
+> "$bscs_log"
+
+# test merge cases that should succeed
+for folder in "$merge_pass_folder/"*.in; do
+ echo -n "#### Running ${folder%.in}"
+ echo "#### Running ${folder%.in}" >> "$bscs_log"
+ out_folder=${folder%.in}.out
+ TMPDIR=$(mktemp -d)
+ TMPDIR=$TMPDIR mounting_script="./fake_mounting_script.sh" unmount=true \
+ mounting_script_test_dir="$folder" "$bscs_script"
"merge" \
+ "version2" &>> "$bscs_log"
+ exit_code="$?"
+ if [ "$exit_code" -ne 0 ]; then
+ echo ": FAILED (exit code "$exit_code")" 1>&2
+ elif ! diff -r "$TMPDIR/"*/ "$out_folder/" &>>
"$bscs_log"; then
+ echo ": FAILED (different diff)" 1>&2
+ else
+ echo ": OK" 1>&2
+ fi
+ rm -rf $TMPDIR
+done
+
+
+# test merge changes that should fail
+for folder in "$merge_fail_folder/"*.in; do
+ echo -n "#### Running ${folder%.in}"
+ echo "#### Running ${folder%.in}" >> "$bscs_log"
+ TMPDIR=$(mktemp -d)
+ TMPDIR=$TMPDIR mounting_script="./fake_mounting_script.sh" unmount=true \
+ mounting_script_test_dir="$folder" "$bscs_script"
"merge" \
+ "version2" &>> "$bscs_log"
+ if [ $? -eq 0 ]; then
+ echo ": FAILED" 1>&2
+ else
+ echo ": OK" 1>&2
+ fi
+ rm -rf $TMPDIR
+done
+
+
+# test the sync mode
+echo -n "#### Running sync test on $sync_folder"
+echo "#### Running sync test on $sync_folder" >> "$bscs_log"
+out_folder=${sync_folder}.out
+TMPDIR=$(mktemp -d)
+TMPDIR=$TMPDIR mounting_script="./fake_mounting_script.sh" unmount=true \
+ mounting_script_test_dir="${sync_folder}.in" "$bscs_script"
"sync" \
+ "version3" &>> "$bscs_log"
+exit_code="$?"
+if [ "$exit_code" -ne 0 ]; then
+ echo ": FAILED (exit code "$exit_code")" 1>&2
+elif ! diff -r "$TMPDIR/"*/ "$out_folder/" &>>
"$bscs_log"; then
+ echo ": FAILED (different diff)" 1>&2
+else
+ echo ": OK" 1>&2
+fi
+rm -rf $TMPDIR
--
1.7.10.4
8:26 a.m.
On Thu, Jun 27, 2013 at 11:09:42AM +0100, Tiago Gomes wrote:
repo: ssh://git@git.baserock.org/baserock/baserock/tbdiff.git
branch: baserock/tiagogomes/bscs-test-suite
commit: 6858235193d798d9985550d58548d22990a4cd27
Could you add a baserock-system-config-sync/README that explains
how to run the test suite, please?
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
8:39 a.m.
On Thu, Jun 27, 2013 at 01:26:22PM +0100, Lars Wirzenius wrote:
On Thu, Jun 27, 2013 at 11:09:42AM +0100, Tiago Gomes wrote:
> repo: ssh://git@git.baserock.org/baserock/baserock/tbdiff.git
> branch: baserock/tiagogomes/bscs-test-suite
> commit: 6858235193d798d9985550d58548d22990a4cd27
Could you add a baserock-system-config-sync/README that explains
how to run the test suite, please?
Oh, and also can you make it so that when the tbdiff chunk gets built,
the baserock-system-config-sync tests get run and that the build fails
if the tests do not succeed?
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
8:53 a.m.
On 27/06/13 13:39, Lars Wirzenius wrote:
On Thu, Jun 27, 2013 at 01:26:22PM +0100, Lars Wirzenius wrote:
> On Thu, Jun 27, 2013 at 11:09:42AM +0100, Tiago Gomes wrote:
>> repo: ssh://git@git.baserock.org/baserock/baserock/tbdiff.git
>> branch: baserock/tiagogomes/bscs-test-suite
>> commit: 6858235193d798d9985550d58548d22990a4cd27
> Could you add a baserock-system-config-sync/README that explains
> how to run the test suite, please?
Oh, and also can you make it so that when the tbdiff chunk gets built,
the baserock-system-config-sync tests get run and that the build fails
if the tests do not succeed?
Only the baserock-system-config-sync tests or the remain tests in tbdiff
too?
Because there is one test in tbdiff that currently is failing.
Tiago
8:58 a.m.
On Thu, Jun 27, 2013 at 01:53:37PM +0100, Tiago Gomes wrote:
On 27/06/13 13:39, Lars Wirzenius wrote:
>On Thu, Jun 27, 2013 at 01:26:22PM +0100, Lars Wirzenius wrote:
>>On Thu, Jun 27, 2013 at 11:09:42AM +0100, Tiago Gomes wrote:
>>>repo: ssh://git@git.baserock.org/baserock/baserock/tbdiff.git
>>>branch: baserock/tiagogomes/bscs-test-suite
>>>commit: 6858235193d798d9985550d58548d22990a4cd27
>>Could you add a baserock-system-config-sync/README that explains
>>how to run the test suite, please?
>Oh, and also can you make it so that when the tbdiff chunk gets built,
>the baserock-system-config-sync tests get run and that the build fails
>if the tests do not succeed?
>
Only the baserock-system-config-sync tests or the remain tests in
tbdiff too?
Because there is one test in tbdiff that currently is failing.
All of them, please. This will give us the inspiration to fix the
tbdiff test failure.
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
9:03 a.m.
On Thu, Jun 27, 2013 at 01:58:43PM +0100, Lars Wirzenius wrote:
> Only the baserock-system-config-sync tests or the remain tests
in
> tbdiff too?
> Because there is one test in tbdiff that currently is failing.
All of them, please. This will give us the inspiration to fix the
tbdiff test failure.
I'd like Tiago to characterise the tbdiff failure here before we opt to enable
them. Not least it'll stop all system builds if we do.
D.
--
Daniel Silverstone http://www.codethink.co.uk/
Senior Developer GPG 4096/R Key Id: 3CCE BABE 206C 3B69
9:53 a.m.
On 27/06/13 14:03, Daniel Silverstone wrote:
On Thu, Jun 27, 2013 at 01:58:43PM +0100, Lars Wirzenius wrote:
>> Only the baserock-system-config-sync tests or the remain tests in
>> tbdiff too?
>> Because there is one test in tbdiff that currently is failing.
> All of them, please. This will give us the inspiration to fix the
> tbdiff test failure.
I'd like Tiago to characterise the tbdiff failure here before we opt to enable
them. Not least it'll stop all system builds if we do.
D.
The problem is that for some reason baserock does not allow to set
extended attributes in temporaries inside /tmp.
option 1: disable this particular test
option 2: update the attr chunk and see if the problem is fixed
option 3: move the tests temporary directory to outside /tmp
Tiago
10:01 a.m.
On Thu, Jun 27, 2013 at 02:53:37PM +0100, Tiago Gomes wrote:
The problem is that for some reason baserock does not allow to set
extended attributes in temporaries inside /tmp.
This is a kernel issue. I believe there was talk recently of adding
xattr support to tmpfs, but I'm unsure.
option 1: disable this particular test
option 2: update the attr chunk and see if the problem is fixed
The problem isn't in attr.
option 3: move the tests temporary directory to outside /tmp
I would opt for this, since we want to continue testing all behaviours.
10:16 a.m.
On Thu, Jun 27, 2013 at 02:53:37PM +0100, Tiago Gomes wrote:
The problem is that for some reason baserock does not allow to set
extended attributes in temporaries inside /tmp.
Possibly we don't support XATTRs in tmpfs.
option 1: disable this particular test
option 2: update the attr chunk and see if the problem is fixed
option 3: move the tests temporary directory to outside /tmp
I like option 3 the best -- run the tests in a subdir of the build tree.
D.
--
Daniel Silverstone http://www.codethink.co.uk/
Senior Developer GPG 4096/R Key Id: 3CCE BABE 206C 3B69
3627
days inactive
3627
days old
10 comments
4 participants
participants (4)
-
Daniel Silverstone -
Lars Wirzenius -
Richard Maw -
Tiago Gomes