)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"8c85cf8fdc446e332f66059aeb35057385539f85","unresolved":true,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"[1] https://patchwork.ozlabs.org/project/ovn/patch/20220808182845.2746916-2-mmichels@redhat.com/"},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Change-Id: Ia3112b9a219b90af718c49776da49078449f09a2"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"62461f72_864ab536","line":15,"range":{"start_line":15,"start_character":11,"end_line":15,"end_character":52},"updated":"2022-11-09 08:40:35.000000000","message":"please add two cherry pick lines, with master commit id and zed commit id.","commit_id":"033fa7a58a0e7bb4b3a7ca0fa58a0bf382b7dd63"},{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"9743bce5388010bc24a15b6c58023583f5483353","unresolved":true,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"[1] https://patchwork.ozlabs.org/project/ovn/patch/20220808182845.2746916-2-mmichels@redhat.com/"},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Change-Id: Ia3112b9a219b90af718c49776da49078449f09a2"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"b749f8db_d67d1f11","line":15,"range":{"start_line":15,"start_character":11,"end_line":15,"end_character":52},"in_reply_to":"427e6668_c19556e7","updated":"2022-11-14 03:43:53.000000000","message":"\u003e Yeah, this is just a consequence of clicking cherry-pick in gerrit before the previous version gets merged. I can fix it after the parent merges--until then it\u0027s impossible. It was just taking long enough to merge that I wanted to work on doing the backports in parallel.\n\nTBH I don\u0027t like that behavior of gerrit but it is how it behaves. In case you are submitting early backport then you can add the hash manually or use cli instead of web interface.\n \n\u003e Quick question: Do we have some documentation somewhere on the proper usage of \"cherry picked from\" with OpenStack projects? I\u0027ve never heard of a project wanting multiple \"cherry picked from\" lines, since you can\u0027t cherry pick from multiple commits. The git cherry-pick -x documentation even mentions not using it at all if it isn\u0027t a clean change. I checked [1], [2], and [3] and didn\u0027t see anyhing (though [3] mentions using cherry-pick -x to avoid a gerrit bug that was resolved in 2016).\n\nI\u0027m not aware of any official document and I think the policy depends on each project. But the intention to add the commit hash is to allow tracking all backports back to that stable branch.\n\n\u003e I\u0027m just trying to figure out if this is an OpenStack-wide suggested behavior, or something more common on the deployment tool projects, etc.\n\nAs far as I\u0027ve worked in multiple projects such as Nova, Cinder, Neutron and etc,  this is community-wide recommendation.\n\n\u003e \n\u003e [1] https://docs.openstack.org/hacking/latest/user/hacking.html#commit-messages\n\u003e [2] https://wiki.openstack.org/wiki/GitCommitMessages\n\u003e [3] https://docs.openstack.org/project-team-guide/stable-branches.html","commit_id":"033fa7a58a0e7bb4b3a7ca0fa58a0bf382b7dd63"},{"author":{"_account_id":5756,"name":"Terry Wilson","email":"twilson@redhat.com","username":"otherwiseguy"},"change_message_id":"04937d12b31c098957b98bfb8de6485d87eb7ce3","unresolved":true,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"[1] https://patchwork.ozlabs.org/project/ovn/patch/20220808182845.2746916-2-mmichels@redhat.com/"},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Change-Id: Ia3112b9a219b90af718c49776da49078449f09a2"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"427e6668_c19556e7","line":15,"range":{"start_line":15,"start_character":11,"end_line":15,"end_character":52},"in_reply_to":"62461f72_864ab536","updated":"2022-11-09 15:47:55.000000000","message":"Yeah, this is just a consequence of clicking cherry-pick in gerrit before the previous version gets merged. I can fix it after the parent merges--until then it\u0027s impossible. It was just taking long enough to merge that I wanted to work on doing the backports in parallel.\n\nQuick question: Do we have some documentation somewhere on the proper usage of \"cherry picked from\" with OpenStack projects? I\u0027ve never heard of a project wanting multiple \"cherry picked from\" lines, since you can\u0027t cherry pick from multiple commits. The git cherry-pick -x documentation even mentions not using it at all if it isn\u0027t a clean change. I checked [1], [2], and [3] and didn\u0027t see anyhing (though [3] mentions using cherry-pick -x to avoid a gerrit bug that was resolved in 2016).\n\nI\u0027m just trying to figure out if this is an OpenStack-wide suggested behavior, or something more common on the deployment tool projects, etc.\n\n[1] https://docs.openstack.org/hacking/latest/user/hacking.html#commit-messages\n[2] https://wiki.openstack.org/wiki/GitCommitMessages\n[3] https://docs.openstack.org/project-team-guide/stable-branches.html","commit_id":"033fa7a58a0e7bb4b3a7ca0fa58a0bf382b7dd63"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"2e2ef83d394b3bb92832d20361a9bc8d567c261d","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":3,"id":"0d87afb8_c55f6c1c","updated":"2022-11-09 08:44:08.000000000","message":"Also, this is not a clean cherry pick from zed, right ? Then we need the Conflicts note to explain at least which files required manual resolution.","commit_id":"033fa7a58a0e7bb4b3a7ca0fa58a0bf382b7dd63"},{"author":{"_account_id":5756,"name":"Terry Wilson","email":"twilson@redhat.com","username":"otherwiseguy"},"change_message_id":"04937d12b31c098957b98bfb8de6485d87eb7ce3","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":3,"id":"a60af353_eb50c035","in_reply_to":"0d87afb8_c55f6c1c","updated":"2022-11-09 15:47:55.000000000","message":"Will do. Thanks.","commit_id":"033fa7a58a0e7bb4b3a7ca0fa58a0bf382b7dd63"},{"author":{"_account_id":5756,"name":"Terry Wilson","email":"twilson@redhat.com","username":"otherwiseguy"},"change_message_id":"ff2bf8901262171bfc44b898ce886c5e7d1a3ddc","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"53c8bdb1_16218173","in_reply_to":"a60af353_eb50c035","updated":"2022-11-09 23:41:28.000000000","message":"Done","commit_id":"033fa7a58a0e7bb4b3a7ca0fa58a0bf382b7dd63"}]}