126 lines
4.8 KiB
Plaintext
126 lines
4.8 KiB
Plaintext
{
|
|
"comments": [
|
|
{
|
|
"unresolved": false,
|
|
"key": {
|
|
"uuid": "cf2a71e4_a2aa39f6",
|
|
"filename": "/PATCHSET_LEVEL",
|
|
"patchSetId": 3
|
|
},
|
|
"lineNbr": 0,
|
|
"author": {
|
|
"id": 4146
|
|
},
|
|
"writtenOn": "2022-08-01T22:59:42Z",
|
|
"side": 1,
|
|
"message": "I\u0027m ok with this behavior change as a user since I almost always `git rebase --abort` in this situation myself. However, I think the reason to keep it may be if other users are less comfortable starting a new rebase by hand, but are comfortable completing the one that git review starts for you.",
|
|
"revId": "e54d324370187039eb3cc9899d480ab70be58714",
|
|
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
|
},
|
|
{
|
|
"unresolved": true,
|
|
"key": {
|
|
"uuid": "81555acd_ab6107b1",
|
|
"filename": "/PATCHSET_LEVEL",
|
|
"patchSetId": 3
|
|
},
|
|
"lineNbr": 0,
|
|
"author": {
|
|
"id": 7118
|
|
},
|
|
"writtenOn": "2022-08-02T20:00:40Z",
|
|
"side": 1,
|
|
"message": "I would say this is ok, because I don\u0027t think in this case I\u0027ve ever done anything but something ~ \"git rebase --abort; git fetch -a; git rebase -i origin/\u003cbranch, usually master\u003e\" and merged things directly like that.\n\nUnpacking those three commands for someone who a priori didn\u0027t know anything about git would probably take about a full day of tutorials and explanation about branches, rebases, staging commits, etc. :/ But I don\u0027t think that\u0027s really git-review\u0027s fault.\n\nIf you really don\u0027t know what\u0027s happening, resetting it so you can work your way through understanding the rebase process seems a good idea (at least you can follow tutorials, etc.). If you do know what\u0027s happening, I imagine most like myself abort it and pull in changes manually anyway, because they want an up-to-date tree locally. So ++ on the behaviour",
|
|
"revId": "e54d324370187039eb3cc9899d480ab70be58714",
|
|
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
|
},
|
|
{
|
|
"unresolved": true,
|
|
"key": {
|
|
"uuid": "508381ea_4b8c2ca5",
|
|
"filename": "git_review/cmd.py",
|
|
"patchSetId": 3
|
|
},
|
|
"lineNbr": 990,
|
|
"author": {
|
|
"id": 4146
|
|
},
|
|
"writtenOn": "2024-03-05T15:36:49Z",
|
|
"side": 1,
|
|
"message": "Nit abort_rebase()\u0027s return values don\u0027t appear to be meaningful where used below. Could simplify this function to reflect that better by dropping these two explicit return values. But they also don\u0027t hurt anything.",
|
|
"revId": "e54d324370187039eb3cc9899d480ab70be58714",
|
|
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
|
},
|
|
{
|
|
"unresolved": false,
|
|
"key": {
|
|
"uuid": "3ce9b918_5f005d19",
|
|
"filename": "git_review/cmd.py",
|
|
"patchSetId": 3
|
|
},
|
|
"lineNbr": 990,
|
|
"author": {
|
|
"id": 5263
|
|
},
|
|
"writtenOn": "2024-03-05T22:01:44Z",
|
|
"side": 1,
|
|
"message": "Done.",
|
|
"parentUuid": "508381ea_4b8c2ca5",
|
|
"revId": "e54d324370187039eb3cc9899d480ab70be58714",
|
|
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
|
},
|
|
{
|
|
"unresolved": true,
|
|
"key": {
|
|
"uuid": "fbb7bb8f_3b881738",
|
|
"filename": "git_review/tests/test_git_review.py",
|
|
"patchSetId": 3
|
|
},
|
|
"lineNbr": 332,
|
|
"author": {
|
|
"id": 4146
|
|
},
|
|
"writtenOn": "2024-03-05T15:36:49Z",
|
|
"side": 1,
|
|
"message": "Would be good to have this test check the git rebase state after running git review. Also adding a new test for the -K flag to check that the rebase is not aborted. Basically a new test that is a small variant of this existing test.",
|
|
"revId": "e54d324370187039eb3cc9899d480ab70be58714",
|
|
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
|
},
|
|
{
|
|
"unresolved": false,
|
|
"key": {
|
|
"uuid": "8f0f7ebe_fd43b0f6",
|
|
"filename": "git_review/tests/test_git_review.py",
|
|
"patchSetId": 3
|
|
},
|
|
"lineNbr": 332,
|
|
"author": {
|
|
"id": 5263
|
|
},
|
|
"writtenOn": "2024-03-05T22:01:44Z",
|
|
"side": 1,
|
|
"message": "Done.",
|
|
"parentUuid": "fbb7bb8f_3b881738",
|
|
"revId": "e54d324370187039eb3cc9899d480ab70be58714",
|
|
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
|
},
|
|
{
|
|
"unresolved": false,
|
|
"key": {
|
|
"uuid": "455e0d15_b5d6106c",
|
|
"filename": "git_review/tests/test_git_review.py",
|
|
"patchSetId": 3
|
|
},
|
|
"lineNbr": 332,
|
|
"author": {
|
|
"id": 5263
|
|
},
|
|
"writtenOn": "2024-03-05T22:01:44Z",
|
|
"side": 1,
|
|
"message": "Done.",
|
|
"parentUuid": "fbb7bb8f_3b881738",
|
|
"revId": "e54d324370187039eb3cc9899d480ab70be58714",
|
|
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
|
}
|
|
]
|
|
} |