diff options
| author | Filippo Valsorda <filippo@golang.org> | 2021-02-07 23:51:49 +0100 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2021-02-12 15:35:42 +0000 |
| commit | 936829eff438c104d04d1e026999ef488c5832fb (patch) | |
| tree | 14da80db9fa96c853aea470bc97b82810ab9523e /codereview.cfg | |
| parent | 0d34d85dee216b62a4212d25de57e1119c1e7ee5 (diff) | |
| download | go-936829eff438c104d04d1e026999ef488c5832fb.tar.gz go-936829eff438c104d04d1e026999ef488c5832fb.zip | |
[dev.boringcrypto.go1.16] all: branch dev.boringcrypto.go1.16
We don't set a parent-branch because we can't use "git-codereview
sync-branch" to do our merges since we want them to happen at a specific
commit (the release tag), not at the HEAD of the release-branch.
We have misc/boring/merge.sh for release merges.
To be fair, we can't use it for dev.boringcrypto merges either, because
those also need to happen at the first conflicting commit, not at HEAD,
but I am hoping eventually we'll get release merges into the release
process, and maybe add a flag to sync-branch for master merges.
Change-Id: Ia1fbe284f0d7fe82c29109b40601139697e2e1e3
Reviewed-on: https://go-review.googlesource.com/c/go/+/290173
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Katie Hockman <katie@golang.org>
Reviewed-by: Roland Shoemaker <roland@golang.org>
Trust: Filippo Valsorda <filippo@golang.org>
Run-TryBot: Filippo Valsorda <filippo@golang.org>
Diffstat (limited to 'codereview.cfg')
| -rw-r--r-- | codereview.cfg | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/codereview.cfg b/codereview.cfg index 4157a7260b..f098921561 100644 --- a/codereview.cfg +++ b/codereview.cfg @@ -1,2 +1 @@ -branch: dev.boringcrypto -parent-branch: master +branch: dev.boringcrypto.go1.16 |