Update patch set 14
Patch Set 14: (5 comments) Patch-set: 14
This commit is contained in:
Gerrit User 1054
Gerrit Code Review
parent
870c9da8da
commit
c2012011b0
|
|
@ -40,6 +40,24 @@
|
|||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543",
|
||||
"unresolved": false
|
||||
},
|
||||
{
|
||||
"key": {
|
||||
"uuid": "5f7c97a3_de3a22cb",
|
||||
"filename": "fixtures_git/gitfixture.py",
|
||||
"patchSetId": 14
|
||||
},
|
||||
"lineNbr": 95,
|
||||
"author": {
|
||||
"id": 1054
|
||||
},
|
||||
"writtenOn": "2018-06-27T10:24:36Z",
|
||||
"side": 1,
|
||||
"message": "Sure.",
|
||||
"parentUuid": "5f7c97a3_fedf0709",
|
||||
"revId": "2b15b3ef3b4182bc75c80cea0d622a15cac84fd7",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543",
|
||||
"unresolved": false
|
||||
},
|
||||
{
|
||||
"key": {
|
||||
"uuid": "5f7c97a3_1e73e34f",
|
||||
|
|
@ -63,6 +81,30 @@
|
|||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543",
|
||||
"unresolved": false
|
||||
},
|
||||
{
|
||||
"key": {
|
||||
"uuid": "5f7c97a3_3ea31601",
|
||||
"filename": "fixtures_git/gitfixture.py",
|
||||
"patchSetId": 14
|
||||
},
|
||||
"lineNbr": 113,
|
||||
"author": {
|
||||
"id": 1054
|
||||
},
|
||||
"writtenOn": "2018-06-27T10:24:36Z",
|
||||
"side": 1,
|
||||
"message": "Git supports merging while ignoring the history from the branch you ask to be merged, so:\n\n git checkout master\n git merge -s ours branchA\n\nWill result in a merge commit but nothing from branchA is included, master this looks the same as it did before the merge. This is used to be able to retain the history of branchA without needing to keep it around as maybe a critical change was put on it but master had already moved on with a different approach. While it\u0027s not needed it\u0027s considered useful to record as an alternative approach should someone wish to come back to this issue without needing to look to ticket items or remember various branch names.\n\nSo how best to explain this in context with the subsequent paragraph?",
|
||||
"parentUuid": "5f7c97a3_1e73e34f",
|
||||
"range": {
|
||||
"startLine": 112,
|
||||
"startChar": 7,
|
||||
"endLine": 113,
|
||||
"endChar": 78
|
||||
},
|
||||
"revId": "2b15b3ef3b4182bc75c80cea0d622a15cac84fd7",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543",
|
||||
"unresolved": false
|
||||
},
|
||||
{
|
||||
"key": {
|
||||
"uuid": "5f7c97a3_9ee5b3a6",
|
||||
|
|
@ -86,6 +128,30 @@
|
|||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543",
|
||||
"unresolved": false
|
||||
},
|
||||
{
|
||||
"key": {
|
||||
"uuid": "5f7c97a3_8801d006",
|
||||
"filename": "fixtures_git/gitfixture.py",
|
||||
"patchSetId": 14
|
||||
},
|
||||
"lineNbr": 240,
|
||||
"author": {
|
||||
"id": 1054
|
||||
},
|
||||
"writtenOn": "2018-06-27T10:24:36Z",
|
||||
"side": 1,
|
||||
"message": "Ideally yes as that helps ensure that files will conflict easily, but at the moment this is currently using the same content just repeated.",
|
||||
"parentUuid": "5f7c97a3_9ee5b3a6",
|
||||
"range": {
|
||||
"startLine": 240,
|
||||
"startChar": 7,
|
||||
"endLine": 240,
|
||||
"endChar": 16
|
||||
},
|
||||
"revId": "2b15b3ef3b4182bc75c80cea0d622a15cac84fd7",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543",
|
||||
"unresolved": false
|
||||
},
|
||||
{
|
||||
"key": {
|
||||
"uuid": "5f7c97a3_fe65c71d",
|
||||
|
|
@ -109,6 +175,30 @@
|
|||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543",
|
||||
"unresolved": false
|
||||
},
|
||||
{
|
||||
"key": {
|
||||
"uuid": "5f7c97a3_1e1dfa60",
|
||||
"filename": "fixtures_git/gitfixture.py",
|
||||
"patchSetId": 14
|
||||
},
|
||||
"lineNbr": 276,
|
||||
"author": {
|
||||
"id": 1054
|
||||
},
|
||||
"writtenOn": "2018-06-27T10:24:36Z",
|
||||
"side": 1,
|
||||
"message": "Means you have to explicitly set it, or need to default it to some other value that is then set to one if change_ids isn\u0027t set.\n\nI guess it might be easier to base this on a couple of use cases:\n\n * create single commit\n add_commits()\n * create single commit with specific change id\n add_commits(change_ids\u003d[\"I01\"])\n * create multiple changes\n add_commits(3)\n * create multiple changes with specific change ids\n add_commits(change_ids[\"I01\", \"I02\", \"I03\"])\n * create multiple changes, with first ones with specific change ids\n add_commits(5, change_ids[\"I01\", \"I02\", \"I03\"])\n which creates 3 commits with given change ids, and two further commits without change_ids.\n\nBut it also currently as you pointed out allows specifying a smaller number and will increase that automatically if the number of change ids is higher, which might be a bit confusing.\n\n * create 3 commits even though only 2 asked for\n add_commits(2, change_ids[\"I01\", \"I02\", \"I03\"])\n\nWhat I\u0027m not sure about is which ones of the last two edge cases make sense and if not how best to detect them without forcing the number to always be provided.\n\nAny suggestions?",
|
||||
"parentUuid": "5f7c97a3_fe65c71d",
|
||||
"range": {
|
||||
"startLine": 276,
|
||||
"startChar": 8,
|
||||
"endLine": 276,
|
||||
"endChar": 39
|
||||
},
|
||||
"revId": "2b15b3ef3b4182bc75c80cea0d622a15cac84fd7",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543",
|
||||
"unresolved": false
|
||||
},
|
||||
{
|
||||
"key": {
|
||||
"uuid": "5f7c97a3_1e7c43b4",
|
||||
|
|
@ -131,6 +221,30 @@
|
|||
"revId": "2b15b3ef3b4182bc75c80cea0d622a15cac84fd7",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543",
|
||||
"unresolved": false
|
||||
},
|
||||
{
|
||||
"key": {
|
||||
"uuid": "5f7c97a3_1ec73a9a",
|
||||
"filename": "fixtures_git/utils.py",
|
||||
"patchSetId": 14
|
||||
},
|
||||
"lineNbr": 18,
|
||||
"author": {
|
||||
"id": 1054
|
||||
},
|
||||
"writtenOn": "2018-06-27T10:24:36Z",
|
||||
"side": 1,
|
||||
"message": "Starting with the assumption they are internal only and generally not expected to be used directly by any consumer code, so we can safely refactor them without worrying about breaking customers.\n\nIf they do rely on them, it\u0027s done with the knowledge that we may alter the behaviour radically.",
|
||||
"parentUuid": "5f7c97a3_1e7c43b4",
|
||||
"range": {
|
||||
"startLine": 18,
|
||||
"startChar": 4,
|
||||
"endLine": 18,
|
||||
"endChar": 20
|
||||
},
|
||||
"revId": "2b15b3ef3b4182bc75c80cea0d622a15cac84fd7",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543",
|
||||
"unresolved": false
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
Reference in New Issue