summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2025-01-24 12:12:00 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2025-01-24 12:23:22 +0100
commit5e104a526cf76fe75312d2fd288a3c88f506fb0a (patch)
treec37892136648b438f96e44ad05dcd0b0fb2a2b37 /CHANGELOG.md
parentbc5eee755cb649e850911c644ba4e55e83c78dd9 (diff)
downloadjustbuild-5e104a526cf76fe75312d2fd288a3c88f506fb0a.tar.gz
"generic" rule: verify staging conflicts on inputs
The "generic" rules deliberately resolves conflicts on identical paths in a latest-wins fashion (seeing all artifacts as later than all runfiles) to allow an easy way to define actions. However, the inputs stage obtained by this resolution can still contain conflicts and those are an error. Properly detect those. Also clarify in the documentation, that only conflicts on identical paths are resolved in the described priority, not semantic overlap.
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d3234e3..8850971d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ A feature release on top of `1.4.0`, backwards compatible.
### Fixes
+- The "generic" rule now properly detects staging conflicts.
- Fixes ensuring proper pointer life time and access check.
- A race condition in the use of `libgit2` was fixed that could
result in a segmentation fault.