diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2020-06-24 06:47:06 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-06-24 06:47:06 +0000 |
| commit | 88f280d541e2f7c7b8655bab65bb1eb682872a16 (patch) | |
| tree | aeb0a23c5ee8cec0c1ffcf61da1f83453fa63601 /tests/format/junctions/duplicates-override-dup/subproject.bst | |
| parent | e4e3b4568e6f7e1575fdd90ec2c688ceee97322e (diff) | |
| parent | 3d5d655e40470a805999834560605d6e54bd7d72 (diff) | |
| download | buildstream-88f280d541e2f7c7b8655bab65bb1eb682872a16.tar.gz | |
Merge branch 'tristan/junction-jungle' into 'master'
Explicit control of junction configuration overrides
Closes #1326
See merge request BuildStream/buildstream!1901
Diffstat (limited to 'tests/format/junctions/duplicates-override-dup/subproject.bst')
| -rw-r--r-- | tests/format/junctions/duplicates-override-dup/subproject.bst | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/format/junctions/duplicates-override-dup/subproject.bst b/tests/format/junctions/duplicates-override-dup/subproject.bst new file mode 100644 index 000000000..376ac11ee --- /dev/null +++ b/tests/format/junctions/duplicates-override-dup/subproject.bst @@ -0,0 +1,8 @@ +kind: junction +sources: +- kind: local + path: subproject + +config: + overrides: + subproject1.bst: subproject3.bst |