Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

buildstream
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

79bbefe2

Commit 79bbefe2 authored 6 years ago by Tristan Van Berkom

Downloads
- Plain Diff

Merge branch 'tristan/fix-overlap-subproject-policy-1.2' into 'bst-1.2'

Observe fail-on-overlap policy on building element's project

See merge request !1172

parents c270d09a ad526441

No related branches found

No related tags found

Loading

Pipeline #50259026 failed 6 years ago

Stage: test

Changes 8
Pipelines 12

Hide whitespace changes

Inline Side-by-side

Showing

buildstream/element.py 2 additions, 2 deletions

buildstream/element.py
tests/frontend/overlaps.py 33 additions, 8 deletions

tests/frontend/overlaps.py
tests/frontend/overlaps/sub-collect.bst 11 additions, 0 deletions

tests/frontend/overlaps/sub-collect.bst
tests/frontend/overlaps/sub-project/a-sub.bst 7 additions, 0 deletions

tests/frontend/overlaps/sub-project/a-sub.bst
tests/frontend/overlaps/sub-project/files/a/file3 1 addition, 0 deletions

tests/frontend/overlaps/sub-project/files/a/file3
tests/frontend/overlaps/sub-project/files/z/file1 1 addition, 0 deletions

tests/frontend/overlaps/sub-project/files/z/file1
tests/frontend/overlaps/sub-project/files/z/file2 1 addition, 0 deletions

tests/frontend/overlaps/sub-project/files/z/file2
tests/frontend/overlaps/sub-project/z-sub.bst 7 additions, 0 deletions

tests/frontend/overlaps/sub-project/z-sub.bst

with 63 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment