legacy: fixes after lando-api merge (bug 1944562) #227
Conversation
zzzeid
changed the title
There was a problem hiding this comment.
I think there are changes in main that the original merge undid (looks like the files affected are ones that had a conflict). The changes are re-added in this PR, which I assume is related to the changes that you merged after the initial merge and conflict fixes.
This is not ideal, though I think if we can review the diff between main and this branch for those files specifically and make sure nothing else was lost, we can merge this. I marked those files that I think are affected by this with a comment.
There was a problem hiding this comment.
The changes here look like they were undone in #226 and are re-added here.
There was a problem hiding this comment.
I think I fixed this by reverting the state of this file to origin/main in the merge-only PR, correct?
There was a problem hiding this comment.
Yes I think this and other similar ones were due to the outdated files in the merge PR but not in the fixup PR.
There was a problem hiding this comment.
These changes appear to be also re-added from a previous commit.
There was a problem hiding this comment.
Why is this part of this PR?
Edit: to clarify this comment, it looks like this was moved from somewhere else? The source possibly got lost in the original merge, but thought I would flag this along with scm.hg below.
There was a problem hiding this comment.
Yes, it was moved from the conftest.py in LandoAPI but it better suited for the global conftest.py than the API-only one.
There was a problem hiding this comment.
Why is this part of this PR?
There was a problem hiding this comment.
It's part of the port? We added several new snippets to retry jobs on error messages from hgmo.
There was a problem hiding this comment.
Bunch of changes here appear to be re-added after the original merge.
There was a problem hiding this comment.
Should be fixed by reverting the state of this file in the merge-only PR to origin/main, correct?
There was a problem hiding this comment.
nit: empty files could be deleted.
|
Closed as this was for illustration purposes. |
This PR includes all the changes in the
api-merge.