Details
-
Type:
Story
-
Status: Done
-
Resolution: Done
-
Fix Version/s: None
-
Component/s: None
-
Labels:None
-
Team:Architecture
Attachments
Issue Links
- blocks
-
- Done
Activity
PR is available here:
https://github.com/lsst/display_firefly/pull/29
As Tim Jenness pointed out, I could have merged the master into the release branch, however, I tried to exercise a backporting procedure, that can be used in more complex cases.
The pull request looks correct to me. Thank you Gabriele Comoretto [X].
Using Github I tried comparing master with the tickets/DM-18332-backporting branch and I am puzzled why they are not the same. This probably shows my unfamiliarity with the backporting procedure. When I examine the affected files individually in the different branches, everything is just as I expect.
David Shupe
added a comment - The pull request looks correct to me. Thank you Gabriele Comoretto [X] .
Using Github I tried comparing master with the tickets/ DM-18332 -backporting branch and I am puzzled why they are not the same. This probably shows my unfamiliarity with the backporting procedure. When I examine the affected files individually in the different branches, everything is just as I expect. If I do git diff from command line, I don't get any differences between master (hash 377950a) and the backporting branch (hash f68dde0).
PR merged to b17.0.x branch
I assign this backport to myself since it looks to be straightforward.