Skip to content

Conversation

@dbasunag
Copy link
Contributor

Short description: Need to cherry-pick #185 to branch 1.5.3.z
More details:
What this PR does / why we need it: Need this for packageManifest resources
Which issue(s) this PR fixes:
Special notes for reviewer:
Bug:

@dbasunag
Copy link
Contributor Author

/verified

@rnetser
Copy link
Collaborator

rnetser commented Nov 16, 2021

/approve

@myakove
Copy link
Collaborator

myakove commented Nov 16, 2021

Rename the title, Cherry-pick is not informative title.

repos:
- repo: https://github.com/hadialqattan/pycln
rev: "v0.0.1-beta.1"
rev: "v1.0.3"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is not related to this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change was picked up by cherry-pick command. I simply resolved the conflict by picking what is in head. Also looks like this change is part of cherrypick against 1.3.10. 0b684ae. Please suggest what needs to be done.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When resolving a conflict and working on a different repo branch (i.e cherrypick from master to 1.5.x), you should use the code that exists in the branch that you're working on (and not the code that you've cherry-picked from).
This way you avoid adding extra code that should not be cherrypicked.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I will remove this, since it does not look like this is in 1.5.3.54. Looks like the same mistake happened with the last cherry-pick(0b684ae), please have someone take a look at it and undo the same as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@myakove and @rnetser , I have removed changes from .pre-commit-config.yaml

@dbasunag dbasunag changed the title Cherry-pick #185 namespae resource: support get raw object in get() - Cherry-pick Nov 16, 2021
@dbasunag dbasunag changed the title namespae resource: support get raw object in get() - Cherry-pick namespace resource: support get raw object in get() - Cherry-pick Nov 16, 2021
@dbasunag dbasunag requested a review from myakove November 16, 2021 15:58
@rnetser
Copy link
Collaborator

rnetser commented Nov 17, 2021

/unapprove

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@dbasunag dbasunag requested a review from rnetser November 17, 2021 11:57
@rnetser
Copy link
Collaborator

rnetser commented Nov 18, 2021

/approve

@rnetser rnetser merged commit ab9c8e8 into RedHatQE:branch-v1.5.3.54 Nov 18, 2021
@dbasunag dbasunag deleted the cherrypick-185 branch July 10, 2022 22:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants