)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"e533f360e7bd79cae3002390de1a291f67fabbfa","unresolved":false,"context_lines":[{"line_number":22,"context_line":"Closes-Bug: #1895220"},{"line_number":23,"context_line":"(cherry picked from commit 66c7f00e1d9d7c0eebe46eb4b24b2b21f7413789)"},{"line_number":24,"context_line":"(cherry picked from commit 95614f600bdc09c2c96ca61a6e7e5d66cc93e9d7)"},{"line_number":25,"context_line":"    Conflicts:"},{"line_number":26,"context_line":"        nova/tests/unit/virt/libvirt/test_driver.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"808e9e28_1d88c070","line":26,"range":{"start_line":25,"start_character":0,"end_line":26,"end_character":51},"updated":"2022-12-13 13:38:52.000000000","message":"Conflicts section is usually placed as the last but one paragraph and in Nova we add notes to make the review easier, something like:\n\nNOTE(elod.illes): the conflict in test_driver.py is caused by patch\nI9b053919bb499c308912c8c9bff4c1fc396c1193 (vtpm feature), which was added in\nvictoria.","commit_id":"bff5eb26737093851b08707c93704ddb09badf4d"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":782,"name":"John Garbutt","email":"john@johngarbutt.com","username":"johngarbutt"},"change_message_id":"6dae6784b6634bd7e1ee20451f7b0065f5d82e08","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":1,"id":"fc92b18b_d72b7438","updated":"2023-02-08 11:12:39.000000000","message":"I am seeing this patch break resize revert in Victoria where it has merged, but I think this patch is just fine once we have this one merged: https://review.opendev.org/c/openstack/nova/+/857423","commit_id":"bff5eb26737093851b08707c93704ddb09badf4d"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"e533f360e7bd79cae3002390de1a291f67fabbfa","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"8afdfacc_f5872cc8","updated":"2022-12-13 13:38:52.000000000","message":"The backport looks good to me. Conflict is listed in commit message and resolved correctly. Patch has merged in stable/victoria.","commit_id":"bff5eb26737093851b08707c93704ddb09badf4d"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"9278d5863f2b874918e35232e0bdfa333507ce09","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":1,"id":"4e7ca937_812287c4","in_reply_to":"80f7ccaf_c70348dd","updated":"2023-02-08 14:09:50.000000000","message":"Oh, thanks for the comment John. In that case we should probably somehow secure to merge these patches *together* or even squash them and merge the squash.","commit_id":"bff5eb26737093851b08707c93704ddb09badf4d"},{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"23a4fe5757f987fb6b27f510827e4abed6cd5ebf","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":1,"id":"80f7ccaf_c70348dd","in_reply_to":"fc92b18b_d72b7438","updated":"2023-02-08 12:57:36.000000000","message":"yes there was a bit of complicated interactions they are both needed to merge togehter ideally\n\nnot all backend behavew the same and finding a combindiation that worked for every thing anctully too 3 diffenrt patches the first of which need to be reverted when this one fixed this bug.","commit_id":"bff5eb26737093851b08707c93704ddb09badf4d"}]}