17.0 fix merge content menu moc #984
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
d-fence
force-pushed
the
17.0-fix-merge-content-menu-moc
branch
3 times, most recently
from
523eec5 to
26adfde
Compare
Williambraecky
approved these changes
Nov 22, 2024
d-fence
force-pushed
the
17.0-fix-merge-content-menu-moc
branch
2 times, most recently
from
6a2b957 to
c8766b8
Compare
Xavier-Do
reviewed
Nov 26, 2024
runbot/models/build_error.py
Outdated
| self_sorted = self.sorted(lambda ec: (not ec.error_id.test_tags, not ec.error_id.responsible, ec.error_id.error_count, ec.id)) | ||
| base_error = self_sorted[0].error_id | ||
| base_error._merge(self_sorted.error_id - base_error) | ||
| self._merge() |
There was a problem hiding this comment.
This is not correct, not the intention of the action_link_errors_contents, we want to merge parent, not errors.
When digging into deactivated build errors, one cannot easily find why an error was deactivated and to which one it was merged. With this commit, a message is added in the chatter to explain where it is merged.
d-fence
force-pushed
the
17.0-fix-merge-content-menu-moc
branch
from
c8766b8 to
9220529
Compare
Duplicate error content should not happens ... but it does. With this commit, a server actions allows to relink error contents and thus removes error contents having the same fingerprint.
d-fence
force-pushed
the
17.0-fix-merge-content-menu-moc
branch
from
e8ac147 to
47ee746
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When digging into deactivated build errors, one cannot easily find why
an error was deactivated and to which one it was merged.