docs(proto): the source branch is deleted after the merge answer
- commit
- 5404729198bb702cecbd86656f36c2a237096c6e
- author
- brice · · 2026-10-19 13:34 UTC
- committer
- brice · · 2026-10-19 14:35 UTC
- parent
- 788238f
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
2 files · +10 -6
M gen/ermite/merge_request.pb.go +5 -3
| @@ -2016,9 +2016,11 @@ type MergeMergeRequestResponse struct { | |||
| 2016 | 2016 | // merged_commit_id set to the new tip of the target branch and merge_mode | |
| 2017 | 2017 | // set to the mode used. | |
| 2018 | 2018 | MergeRequest *MergeRequest `protobuf:"bytes,1,opt,name=merge_request,json=mergeRequest,proto3" json:"merge_request,omitempty"` | |
| 2019 | - | // SourceBranchDeleted is true when delete_source_branch was set and the | |
| 2020 | - | // branch is gone. It is false when the deletion failed after the merge (the | |
| 2021 | - | // branch moved in between, say): the merge stands and the branch is kept. | |
| 2019 | + | // SourceBranchDeleted is true when delete_source_branch was set: the server | |
| 2020 | + | // deletes the branch after answering. The deletion is skipped, and the | |
| 2021 | + | // branch kept, if the branch moved or another open merge request uses it | |
| 2022 | + | // by then; the merge stands either way. Watch reports the deletion with a | |
| 2023 | + | // Pushed event for the source branch. | |
| 2022 | 2024 | SourceBranchDeleted bool `protobuf:"varint,2,opt,name=source_branch_deleted,json=sourceBranchDeleted,proto3" json:"source_branch_deleted,omitempty"` | |
| 2023 | 2025 | unknownFields protoimpl.UnknownFields | |
| 2024 | 2026 | sizeCache protoimpl.SizeCache | |
| @@ -2016,9 +2016,11 @@ type MergeMergeRequestResponse struct { | |||||
| 2016 | // merged_commit_id set to the new tip of the target branch and merge_mode | 2016 | // merged_commit_id set to the new tip of the target branch and merge_mode | ||
| 2017 | // set to the mode used. | 2017 | // set to the mode used. | ||
| 2018 | MergeRequest *MergeRequest `protobuf:"bytes,1,opt,name=merge_request,json=mergeRequest,proto3" json:"merge_request,omitempty"` | 2018 | MergeRequest *MergeRequest `protobuf:"bytes,1,opt,name=merge_request,json=mergeRequest,proto3" json:"merge_request,omitempty"` | ||
| 2019 | - | // SourceBranchDeleted is true when delete_source_branch was set and the | 2019 | + | // SourceBranchDeleted is true when delete_source_branch was set: the server |
| 2020 | - | // branch is gone. It is false when the deletion failed after the merge (the | 2020 | + | // deletes the branch after answering. The deletion is skipped, and the |
| 2021 | - | // branch moved in between, say): the merge stands and the branch is kept. | 2021 | + | // branch kept, if the branch moved or another open merge request uses it |
| 2022 | + | // by then; the merge stands either way. Watch reports the deletion with a | |||
| 2023 | + | // Pushed event for the source branch. | |||
| 2022 | SourceBranchDeleted bool `protobuf:"varint,2,opt,name=source_branch_deleted,json=sourceBranchDeleted,proto3" json:"source_branch_deleted,omitempty"` | 2024 | SourceBranchDeleted bool `protobuf:"varint,2,opt,name=source_branch_deleted,json=sourceBranchDeleted,proto3" json:"source_branch_deleted,omitempty"` | ||
| 2023 | unknownFields protoimpl.UnknownFields | 2025 | unknownFields protoimpl.UnknownFields | ||
| 2024 | sizeCache protoimpl.SizeCache | 2026 | sizeCache protoimpl.SizeCache | ||
M proto/ermite/merge_request.proto +5 -3
| @@ -531,9 +531,11 @@ message MergeMergeRequestResponse { | |||
| 531 | 531 | // merged_commit_id set to the new tip of the target branch and merge_mode | |
| 532 | 532 | // set to the mode used. | |
| 533 | 533 | MergeRequest merge_request = 1; | |
| 534 | - | // SourceBranchDeleted is true when delete_source_branch was set and the | |
| 535 | - | // branch is gone. It is false when the deletion failed after the merge (the | |
| 536 | - | // branch moved in between, say): the merge stands and the branch is kept. | |
| 534 | + | // SourceBranchDeleted is true when delete_source_branch was set: the server | |
| 535 | + | // deletes the branch after answering. The deletion is skipped, and the | |
| 536 | + | // branch kept, if the branch moved or another open merge request uses it | |
| 537 | + | // by then; the merge stands either way. Watch reports the deletion with a | |
| 538 | + | // Pushed event for the source branch. | |
| 537 | 539 | bool source_branch_deleted = 2; | |
| 538 | 540 | } | |
| 539 | 541 | ||
| @@ -531,9 +531,11 @@ message MergeMergeRequestResponse { | |||||
| 531 | // merged_commit_id set to the new tip of the target branch and merge_mode | 531 | // merged_commit_id set to the new tip of the target branch and merge_mode | ||
| 532 | // set to the mode used. | 532 | // set to the mode used. | ||
| 533 | MergeRequest merge_request = 1; | 533 | MergeRequest merge_request = 1; | ||
| 534 | - | // SourceBranchDeleted is true when delete_source_branch was set and the | 534 | + | // SourceBranchDeleted is true when delete_source_branch was set: the server |
| 535 | - | // branch is gone. It is false when the deletion failed after the merge (the | 535 | + | // deletes the branch after answering. The deletion is skipped, and the |
| 536 | - | // branch moved in between, say): the merge stands and the branch is kept. | 536 | + | // branch kept, if the branch moved or another open merge request uses it |
| 537 | + | // by then; the merge stands either way. Watch reports the deletion with a | |||
| 538 | + | // Pushed event for the source branch. | |||
| 537 | bool source_branch_deleted = 2; | 539 | bool source_branch_deleted = 2; | ||
| 538 | } | 540 | } | ||
| 539 | 541 | ||||