This is an automated email from the ASF dual-hosted git repository.
sbp pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
from c777bb4 Add a merge module to automatically resolve conflicts between
revisions
add 517b7bd Resolve conflicts during revision creation, and add a
corresponding test
No new revisions were added by this update.
Summary of changes:
atr/get/test.py | 41 ++++++++++++++++++++++
atr/storage/writers/revision.py | 27 ++++++++++++++
{atr => tests/e2e/merge}/__init__.py | 0
tests/e2e/{committees => merge}/conftest.py | 27 +++++++-------
.../version.py => tests/e2e/merge/helpers.py | 5 ++-
tests/e2e/{root/conftest.py => merge/test_get.py} | 31 ++++++----------
6 files changed, 92 insertions(+), 39 deletions(-)
copy {atr => tests/e2e/merge}/__init__.py (100%)
copy tests/e2e/{committees => merge}/conftest.py (65%)
copy atr/sbom/constants/version.py => tests/e2e/merge/helpers.py (91%)
copy tests/e2e/{root/conftest.py => merge/test_get.py} (66%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
