)]}'
{"/PATCHSET_LEVEL":[{"author":{"_account_id":29244,"name":"Gregory Thiemonge","email":"gthiemon@redhat.com","username":"gthiemonge"},"change_message_id":"9f03d325f916377dfef223216ffb03c400bfac90","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"ae3a61a9_c72ab2d6","updated":"2022-07-19 05:35:52.000000000","message":"The workflow is not correct. The patch should be backported to stable/yoga first, then the commit from stable/yoga should be backported to stable/xena, the stable/xena commit to stable/wallaby, etc...\nwith this method, if you fix a merge conflict when backporting from n to n-1, you prevent a merge conflict when backporting to n-2\n\nI would also recommend using \"git cherry-pick -x \u003cref\u003e\" when creating a backport. -x adds a line in the commit message of the backport that indicates the id of the commit the backport was created from. so if you\u0027re commit on master is 1234567,\nthe commit on yoga will show\n\n\"(cherry picked from commit 1234567)\"\n\nthen the commit on xena will show\n\n\"(cherry picked from commit 1234567)\n(cherry picked from commit \u003cyoga commit\u003e)\"\n\nanother advice, in case of merge conflict, when calling \"git commit\", git automatically adds details about the conflict in the commit message, but those details are commented, please uncomment those lines, it helps reviewers to focus on potential issues in the backport\n\n(a merge conflict is displayed as\n\"Conflict:\n   path/to/my/file1\n   path/to/my/file2\")","commit_id":"7e8a872787d5207a14edbc4385a4d1c0af512b7e"},{"author":{"_account_id":31664,"name":"Omer Schwartz","email":"oschwart@redhat.com","username":"oschwart"},"change_message_id":"4f17d62c899afe323546cdaafe640b40acaabca7","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"d828caa2_108cd62f","in_reply_to":"ae3a61a9_c72ab2d6","updated":"2022-07-19 15:15:14.000000000","message":"Thanks for the detailed guide Greg! I will give it a try soon.","commit_id":"7e8a872787d5207a14edbc4385a4d1c0af512b7e"},{"author":{"_account_id":31664,"name":"Omer Schwartz","email":"oschwart@redhat.com","username":"oschwart"},"change_message_id":"185b0467d523ce604fdf2459f0711919b4d6e358","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":4,"id":"ea0a47c3_7f34e13a","updated":"2022-07-21 12:29:55.000000000","message":"I forgot self.HEALTH_MON.id is being used here https://review.opendev.org/c/openstack/octavia/+/850241/4/octavia/controller/worker/v2/tasks/lifecycle_tasks.py#55\n\nso I am returning it back.","commit_id":"183c0c60a17f8ab0542fe867996c0b962fee7832"}],"octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py":[{"author":{"_account_id":34429,"name":"Tom Weininger","email":"dienste@weinimo.de","username":"tweining"},"change_message_id":"e1caa527d0d42e82bcbaf0aca5d22dfeada11ebb","unresolved":true,"context_lines":[{"line_number":28,"context_line":"        self.AMPHORA.id \u003d self.AMPHORA_ID"},{"line_number":29,"context_line":"        self.HEALTH_MON \u003d mock.MagicMock()"},{"line_number":30,"context_line":"        self.HEALTH_MON_ID \u003d uuidutils.generate_uuid()"},{"line_number":31,"context_line":"        self.HEALTH_MON.id \u003d self.HEALTH_MON_ID"},{"line_number":32,"context_line":"        self.L7POLICY \u003d mock.MagicMock()"},{"line_number":33,"context_line":"        self.L7POLICY_ID \u003d uuidutils.generate_uuid()"},{"line_number":34,"context_line":"        self.L7POLICY.id \u003d self.L7POLICY_ID"}],"source_content_type":"text/x-python","patch_set":3,"id":"c56e809d_d1b06a74","line":31,"range":{"start_line":31,"start_character":8,"end_line":31,"end_character":47},"updated":"2022-07-21 09:16:55.000000000","message":"Although I agree that it makes sense to have this line simply for consistency reasons self.HEALTH_MON.id does not exist in your original patch and hence should not be added in this backport if not strictly needed. Instead, I would simply delete the wrong self.HEALTH_MON.pool_id \u003d self.HEALTH_MON_ID line if it is not used (it seems it isn\u0027t).","commit_id":"370b15456efa04fda06e32131c25ba9019ddb324"},{"author":{"_account_id":31664,"name":"Omer Schwartz","email":"oschwart@redhat.com","username":"oschwart"},"change_message_id":"16e7d4436a43fa85200c0d523d7c895f7c7f79ac","unresolved":false,"context_lines":[{"line_number":28,"context_line":"        self.AMPHORA.id \u003d self.AMPHORA_ID"},{"line_number":29,"context_line":"        self.HEALTH_MON \u003d mock.MagicMock()"},{"line_number":30,"context_line":"        self.HEALTH_MON_ID \u003d uuidutils.generate_uuid()"},{"line_number":31,"context_line":"        self.HEALTH_MON.id \u003d self.HEALTH_MON_ID"},{"line_number":32,"context_line":"        self.L7POLICY \u003d mock.MagicMock()"},{"line_number":33,"context_line":"        self.L7POLICY_ID \u003d uuidutils.generate_uuid()"},{"line_number":34,"context_line":"        self.L7POLICY.id \u003d self.L7POLICY_ID"}],"source_content_type":"text/x-python","patch_set":3,"id":"3c44d40e_05752f2b","line":31,"range":{"start_line":31,"start_character":8,"end_line":31,"end_character":47},"in_reply_to":"c56e809d_d1b06a74","updated":"2022-07-21 10:05:19.000000000","message":"Looking at it again - I agree, self.HEALTH_MON.id is not being used. I will delete the line, thanks.","commit_id":"370b15456efa04fda06e32131c25ba9019ddb324"}]}