diff options
Diffstat (limited to 'atlas/tests/ws_conflict/expected')
-rw-r--r-- | atlas/tests/ws_conflict/expected/atlas.lock | 20 | ||||
-rw-r--r-- | atlas/tests/ws_conflict/expected/deps.dot | 11 | ||||
-rw-r--r-- | atlas/tests/ws_conflict/expected/myproject.nimble | 1 | ||||
-rw-r--r-- | atlas/tests/ws_conflict/expected/nim.cfg | 7 |
4 files changed, 39 insertions, 0 deletions
diff --git a/atlas/tests/ws_conflict/expected/atlas.lock b/atlas/tests/ws_conflict/expected/atlas.lock new file mode 100644 index 000000000..34ace9c44 --- /dev/null +++ b/atlas/tests/ws_conflict/expected/atlas.lock @@ -0,0 +1,20 @@ +{ + "items": { + "apkg": { + "url": "file://./source/apkg", + "commit": "<invalid commit>" + }, + "bpkg": { + "url": "file://./source/bpkg", + "commit": "1.0" + }, + "cpkg": { + "url": "file://./source/cpkg", + "commit": "2.0" + }, + "dpkg": { + "url": "file://./source/dpkg", + "commit": "1.0" + } + } +} \ No newline at end of file diff --git a/atlas/tests/ws_conflict/expected/deps.dot b/atlas/tests/ws_conflict/expected/deps.dot new file mode 100644 index 000000000..0cdfb6cdd --- /dev/null +++ b/atlas/tests/ws_conflict/expected/deps.dot @@ -0,0 +1,11 @@ +digraph deps { +"file://./source/apkg/<invalid commit>" [label=""]; +"file://./source/bpkg/1.0" [label=""]; +"file://./source/cpkg/1.0" [label="unused"]; +"file://./source/cpkg/2.0" [label=""]; +"file://./source/dpkg/1.0" [label=""]; +"file://./source/apkg/<invalid commit>" -> "file://./source/bpkg/1.0"; +"file://./source/apkg/<invalid commit>" -> "file://./source/cpkg/1.0"; +"file://./source/bpkg/1.0" -> "file://./source/cpkg/2.0"; +"file://./source/cpkg/2.0" -> "file://./source/dpkg/1.0"; +} diff --git a/atlas/tests/ws_conflict/expected/myproject.nimble b/atlas/tests/ws_conflict/expected/myproject.nimble new file mode 100644 index 000000000..863e7c171 --- /dev/null +++ b/atlas/tests/ws_conflict/expected/myproject.nimble @@ -0,0 +1 @@ +requires "https://github.com/apkg" diff --git a/atlas/tests/ws_conflict/expected/nim.cfg b/atlas/tests/ws_conflict/expected/nim.cfg new file mode 100644 index 000000000..6f7c73055 --- /dev/null +++ b/atlas/tests/ws_conflict/expected/nim.cfg @@ -0,0 +1,7 @@ +############# begin Atlas config section ########## +--noNimblePath +--path:"../apkg" +--path:"../bpkg" +--path:"../cpkg" +--path:"../dpkg" +############# end Atlas config section ########## |