)]}'
{"doc/source/code-and-documentation/patch-series-tutorial.rst":[{"author":{"_account_id":10608,"name":"Matthew Edmonds","email":"edmondsw@us.ibm.com","username":"edmondsw"},"change_message_id":"0b9d4f9b1ee62a5df8748d24a266815290652095","unresolved":false,"context_lines":[{"line_number":87,"context_line":"  dependent changes. Otherwise you should consider squashing your"},{"line_number":88,"context_line":"  changes into one commit before submitting (for indivisible changes) or"},{"line_number":89,"context_line":"  submitting from separate branches (for independent changes)."},{"line_number":90,"context_line":"  "},{"line_number":91,"context_line":"  The outstanding commits are:"},{"line_number":92,"context_line":"  "},{"line_number":93,"context_line":"  ebb3505 (HEAD, bp/nova-cyborg-interaction) WIP: Cyborg PCI handling"}],"source_content_type":"text/x-rst","patch_set":1,"id":"9fdfeff1_1c6682c2","line":90,"updated":"2019-01-31 22:44:59.000000000","message":"lots of EOL whitespace to cleanup, starting here","commit_id":"390b8f417cd26bcfcb5b2c7a4d9e71c71065225b"},{"author":{"_account_id":14070,"name":"Eric Fried","email":"openstack@fried.cc","username":"efried"},"change_message_id":"48171e6bee14427dd052f6ca9423f382800d74c8","unresolved":false,"context_lines":[{"line_number":87,"context_line":"  dependent changes. Otherwise you should consider squashing your"},{"line_number":88,"context_line":"  changes into one commit before submitting (for indivisible changes) or"},{"line_number":89,"context_line":"  submitting from separate branches (for independent changes)."},{"line_number":90,"context_line":"  "},{"line_number":91,"context_line":"  The outstanding commits are:"},{"line_number":92,"context_line":"  "},{"line_number":93,"context_line":"  ebb3505 (HEAD, bp/nova-cyborg-interaction) WIP: Cyborg PCI handling"}],"source_content_type":"text/x-rst","patch_set":1,"id":"9fdfeff1_7c8b0ec2","line":90,"in_reply_to":"9fdfeff1_1c6682c2","updated":"2019-01-31 23:20:43.000000000","message":"ack, fixing","commit_id":"390b8f417cd26bcfcb5b2c7a4d9e71c71065225b"},{"author":{"_account_id":10608,"name":"Matthew Edmonds","email":"edmondsw@us.ibm.com","username":"edmondsw"},"change_message_id":"0b9d4f9b1ee62a5df8748d24a266815290652095","unresolved":false,"context_lines":[{"line_number":144,"context_line":""},{"line_number":145,"context_line":"  efried:~/openstack/nova$ git restack"},{"line_number":146,"context_line":""},{"line_number":147,"context_line":"This pops me into an editor showing me all the commits between wherever"},{"line_number":148,"context_line":"I am and the main branch (now they\u0027re in top-first order):"},{"line_number":149,"context_line":""},{"line_number":150,"context_line":".. code-block:: console"},{"line_number":151,"context_line":""}],"source_content_type":"text/x-rst","patch_set":1,"id":"9fdfeff1_7ce9cee3","line":148,"range":{"start_line":147,"start_character":55,"end_line":148,"end_character":24},"updated":"2019-01-31 22:44:59.000000000","message":"so... all `git restack` is doing is figuring out what the \u003cx\u003e should be in `git rebase -i \u003cx\u003e` based on how many commits are new to this branch?","commit_id":"390b8f417cd26bcfcb5b2c7a4d9e71c71065225b"},{"author":{"_account_id":14070,"name":"Eric Fried","email":"openstack@fried.cc","username":"efried"},"change_message_id":"48171e6bee14427dd052f6ca9423f382800d74c8","unresolved":false,"context_lines":[{"line_number":144,"context_line":""},{"line_number":145,"context_line":"  efried:~/openstack/nova$ git restack"},{"line_number":146,"context_line":""},{"line_number":147,"context_line":"This pops me into an editor showing me all the commits between wherever"},{"line_number":148,"context_line":"I am and the main branch (now they\u0027re in top-first order):"},{"line_number":149,"context_line":""},{"line_number":150,"context_line":".. code-block:: console"},{"line_number":151,"context_line":""}],"source_content_type":"text/x-rst","patch_set":1,"id":"9fdfeff1_3c9106f2","line":148,"range":{"start_line":147,"start_character":55,"end_line":148,"end_character":24},"in_reply_to":"9fdfeff1_7ce9cee3","updated":"2019-01-31 23:20:43.000000000","message":"Yes. That\u0027s its sole purpose in life.","commit_id":"390b8f417cd26bcfcb5b2c7a4d9e71c71065225b"},{"author":{"_account_id":9562,"name":"Ildiko Vancsa","email":"ildiko.vancsa@gmail.com","username":"ildikov"},"change_message_id":"c5d59185b842d016ddb5f87703fd16a655cbaef5","unresolved":false,"context_lines":[{"line_number":4,"context_line":""},{"line_number":5,"context_line":"This tutorial walks through a simple scenario of developing multiple change"},{"line_number":6,"context_line":"sets in a series on the same branch. If you wish, you can follow along,"},{"line_number":7,"context_line":"executing the commands exactly as they\u0027re laid out. (Yes, you\u0027ll be creating"},{"line_number":8,"context_line":"real change sets in real gerrit, but that\u0027s okay; just abandon them when you\u0027re"},{"line_number":9,"context_line":"done.)"},{"line_number":10,"context_line":""},{"line_number":11,"context_line":"If you are a visual learner, you may prefer"},{"line_number":12,"context_line":"`this video \u003chttps://www.youtube.com/watch?v\u003dmHyvP7zp4Ko\u0026list\u003dPLR97FKPZ-mD9XJCfwDE5c-td9lZGIPfS5\u0026index\u003d4\u003e`_"}],"source_content_type":"text/x-rst","patch_set":4,"id":"9fdfeff1_38ed6d8b","line":9,"range":{"start_line":7,"start_character":53,"end_line":9,"end_character":5},"updated":"2019-02-05 18:00:22.000000000","message":"We have a sandbox repository here: http://git.openstack.org/cgit/openstack-dev/sandbox/\n\nWhile I see the point of showing a real world example I would rather advise people to practice in the sandbox that is for that sole purpose. Uploading changes to a project repository beyond possible disturbance to the project reviewers will also mess with the available contribution metrics.\n\nIn case we would like to prioritize a scenario that people can replicate by copying the commands I think we should come up with something using directly the sandbox repository here.","commit_id":"b51f95634437bcc999836bcbe2d15e61f7d99997"},{"author":{"_account_id":14070,"name":"Eric Fried","email":"openstack@fried.cc","username":"efried"},"change_message_id":"996172a86322e1d95df4e65ff382287ff531368f","unresolved":false,"context_lines":[{"line_number":4,"context_line":""},{"line_number":5,"context_line":"This tutorial walks through a simple scenario of developing multiple change"},{"line_number":6,"context_line":"sets in a series on the same branch. If you wish, you can follow along,"},{"line_number":7,"context_line":"executing the commands exactly as they\u0027re laid out. (Yes, you\u0027ll be creating"},{"line_number":8,"context_line":"real change sets in real gerrit, but that\u0027s okay; just abandon them when you\u0027re"},{"line_number":9,"context_line":"done.)"},{"line_number":10,"context_line":""},{"line_number":11,"context_line":"If you are a visual learner, you may prefer"},{"line_number":12,"context_line":"`this video \u003chttps://www.youtube.com/watch?v\u003dmHyvP7zp4Ko\u0026list\u003dPLR97FKPZ-mD9XJCfwDE5c-td9lZGIPfS5\u0026index\u003d4\u003e`_"}],"source_content_type":"text/x-rst","patch_set":4,"id":"9fdfeff1_1ce86614","line":9,"range":{"start_line":7,"start_character":53,"end_line":9,"end_character":5},"in_reply_to":"9fdfeff1_38ed6d8b","updated":"2019-02-06 22:32:15.000000000","message":"Okay, I respun the example using the sandbox repo.","commit_id":"b51f95634437bcc999836bcbe2d15e61f7d99997"},{"author":{"_account_id":9562,"name":"Ildiko Vancsa","email":"ildiko.vancsa@gmail.com","username":"ildikov"},"change_message_id":"403d5d5ca14ba322f17aaa69b70ec28d561a5d25","unresolved":false,"context_lines":[{"line_number":216,"context_line":"version of the middle one."},{"line_number":217,"context_line":""},{"line_number":218,"context_line":"Now if I push the series back up to gerrit, I get the same confirmation"},{"line_number":219,"context_line":"prompt, and both changes get a new patch set. If you look at the top"},{"line_number":220,"context_line":"patch in gerrit, you\u0027ll see that PS2 shows up as just a rebase."},{"line_number":221,"context_line":""},{"line_number":222,"context_line":".. :: TODO: Describe gotchas when restacking and the automatic rebase results in"},{"line_number":223,"context_line":"      merge conflicts."}],"source_content_type":"text/x-rst","patch_set":5,"id":"9fdfeff1_7b9baf65","line":220,"range":{"start_line":219,"start_character":46,"end_line":220,"end_character":15},"updated":"2019-02-07 12:57:44.000000000","message":"Do you plan to upload the updated chain? As currently Gerrit only shows one patch set.","commit_id":"ba8f81253ae250739712f88a07eef48ff97bc6df"},{"author":{"_account_id":9562,"name":"Ildiko Vancsa","email":"ildiko.vancsa@gmail.com","username":"ildikov"},"change_message_id":"403d5d5ca14ba322f17aaa69b70ec28d561a5d25","unresolved":false,"context_lines":[{"line_number":217,"context_line":""},{"line_number":218,"context_line":"Now if I push the series back up to gerrit, I get the same confirmation"},{"line_number":219,"context_line":"prompt, and both changes get a new patch set. If you look at the top"},{"line_number":220,"context_line":"patch in gerrit, you\u0027ll see that PS2 shows up as just a rebase."},{"line_number":221,"context_line":""},{"line_number":222,"context_line":".. :: TODO: Describe gotchas when restacking and the automatic rebase results in"},{"line_number":223,"context_line":"      merge conflicts."}],"source_content_type":"text/x-rst","patch_set":5,"id":"9fdfeff1_bba357b1","line":220,"range":{"start_line":220,"start_character":33,"end_line":220,"end_character":36},"updated":"2019-02-07 12:57:44.000000000","message":"I think it would be better to say patch set 2 or second patch set as people who will read this are less experienced with git/gerrit and are probably still learning some of the terms.","commit_id":"ba8f81253ae250739712f88a07eef48ff97bc6df"},{"author":{"_account_id":14070,"name":"Eric Fried","email":"openstack@fried.cc","username":"efried"},"change_message_id":"fe607fd5e10c8d4496db4af4838ce4b27153cba5","unresolved":false,"context_lines":[{"line_number":216,"context_line":"version of the middle one."},{"line_number":217,"context_line":""},{"line_number":218,"context_line":"Now if I push the series back up to gerrit, I get the same confirmation"},{"line_number":219,"context_line":"prompt, and both changes get a new patch set. If you look at the top"},{"line_number":220,"context_line":"patch in gerrit, you\u0027ll see that PS2 shows up as just a rebase."},{"line_number":221,"context_line":""},{"line_number":222,"context_line":".. :: TODO: Describe gotchas when restacking and the automatic rebase results in"},{"line_number":223,"context_line":"      merge conflicts."}],"source_content_type":"text/x-rst","patch_set":5,"id":"9fdfeff1_bcd58d1d","line":220,"range":{"start_line":219,"start_character":46,"end_line":220,"end_character":15},"in_reply_to":"9fdfeff1_7b9baf65","updated":"2019-02-07 15:17:33.000000000","message":"Done","commit_id":"ba8f81253ae250739712f88a07eef48ff97bc6df"},{"author":{"_account_id":14070,"name":"Eric Fried","email":"openstack@fried.cc","username":"efried"},"change_message_id":"fe607fd5e10c8d4496db4af4838ce4b27153cba5","unresolved":false,"context_lines":[{"line_number":217,"context_line":""},{"line_number":218,"context_line":"Now if I push the series back up to gerrit, I get the same confirmation"},{"line_number":219,"context_line":"prompt, and both changes get a new patch set. If you look at the top"},{"line_number":220,"context_line":"patch in gerrit, you\u0027ll see that PS2 shows up as just a rebase."},{"line_number":221,"context_line":""},{"line_number":222,"context_line":".. :: TODO: Describe gotchas when restacking and the automatic rebase results in"},{"line_number":223,"context_line":"      merge conflicts."}],"source_content_type":"text/x-rst","patch_set":5,"id":"9fdfeff1_5cdca145","line":220,"range":{"start_line":220,"start_character":33,"end_line":220,"end_character":36},"in_reply_to":"9fdfeff1_bba357b1","updated":"2019-02-07 15:17:33.000000000","message":"Done","commit_id":"ba8f81253ae250739712f88a07eef48ff97bc6df"}]}