PCHR-3930: Fix upgrader numbers #556
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
On #532, an upgrader was added to remove "Vancacies" from the SSP menu. Originally, this upgrader number was 7036. Before this was merged to staging, another PR (#536) was merged adding an upgrader with the same number. This caused a conflict which we tried to fix in 05cd2c6. When fixing conflicts with upgrader coming from staging, the only correct approach is to change the upgrader in our PR to a number higher than whatever we have on staging. The reason is that, if we pick a lower number the upgrader will never be executed. Unfortunately, this is not what happened here. The upgrader was kept with the same name and the number of the one from staging was increased to 7037. Finally, #532 was kept open for quite a long time. In the meanwhile, Another PR (#460) was merged to staging adding an upgrader with the number 7037. This time, git didn't detect the conflict and after #532 was merged we ended up with two upgraders with the same number. To fix this we: - Reverted the change in 05cd2c6 and renamed the upgrader that removes the old "Help" menu back to 7036 - Renamed the upgrader added by #532 to 7038 (one number higher than the latest we have on staging)
tunbola
approved these changes
Sep 18, 2018
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
On #532, an upgrader was added to remove "Vancacies" from the SSP menu. Originally, this upgrader number was 7036. Before this was merged to
staging, another PR (#536) was merged adding an upgrader with the same number.This caused a conflict which we tried to fix in 05cd2c6. When fixing conflicts with upgrader coming from staging, the only correct approach is to change the upgrader in our PR to a number higher than whatever we have on staging. The reason is that, if we pick a lower number the upgrader will never be executed. Unfortunately, this is not what happened here. The upgrader was kept with the same name and the number of the one from staging was increased to 7037.
Finally, #532 was kept open for quite a long time. In the meanwhile, Another PR (#460) was merged to staging adding an upgrader with the number 7037. This time, git didn't detect the conflict and after #532 was merged we ended up with two upgraders with the same number.
To fix this we: