Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

For HasId.setRef, have first set win (with force override) (bp #1655) #1657

Merged
merged 1 commit into from
Nov 6, 2020
Merged

For HasId.setRef, have first set win (with force override) (bp #1655) #1657

merged 1 commit into from
Nov 6, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 5, 2020

This is an automated backport of pull request #1655 done by Mergify

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@jackkoenig
For HasId.setRef, have first set win (with force override) (#1655)
ef95e3b 
This is a refinement of the assertion added in #1616 then removed in
 #1654. Because Records now set the refs of children upon binding,
later, unbound Records could incorrectly override the refs. The first
set should win.

(cherry picked from commit 8187318)
@mergify mergify bot requested a review from a team as a code owner November 5, 2020 23:54
@mergify mergify bot requested review from jackkoenig and removed request for a team November 5, 2020 23:54
@mergify mergify bot added the Backport Automated backport, please consider for minor release label Nov 5, 2020
@mergify mergify bot merged commit d379dca into 3.4.x Nov 6, 2020
@mergify mergify bot deleted the mergify/bp/3.4.x/pr-1655 branch November 6, 2020 00:29
@sequencer sequencer mentioned this pull request Nov 8, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackkoenig jackkoenig jackkoenig approved these changes

Assignees
No one assigned
Labels
Backport Automated backport, please consider for minor release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jackkoenig