From: Arnaud Lacombe <al@aerilon.ca>
Date: Thu, 14 Sep 2023 20:52:54 +0000 (+0000)
Subject: testdata/vcstest/bzr: fix unit test with Ubuntu 2020 LTS bzr 3.0.2
X-Git-Tag: go1.22rc1~821
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7286800338bb43b6c0736885fa2c97267e498d37;p=gostls13.git

testdata/vcstest/bzr: fix unit test with Ubuntu 2020 LTS bzr 3.0.2

As pointed by @bcmills, upstream fixed this in 3.1.0 in https://github.com/breezy-team/breezy/commit/30143860ced0ad9f42cbf18a119f2800117decff

Fixes #62620.

Change-Id: I9fa179a5293aec59496ddd401edec02e1080f1a5
GitHub-Last-Rev: 6066b05054877b33b78afbb32a81457c19f11c9b
GitHub-Pull-Request: golang/go#62652
Reviewed-on: https://go-review.googlesource.com/c/go/+/528437
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
---

diff --git a/src/cmd/go/testdata/vcstest/bzr/hello.txt b/src/cmd/go/testdata/vcstest/bzr/hello.txt
index 7d06503e1a..59315852f7 100644
--- a/src/cmd/go/testdata/vcstest/bzr/hello.txt
+++ b/src/cmd/go/testdata/vcstest/bzr/hello.txt
@@ -1,6 +1,7 @@
 handle bzr
 
 env BZR_EMAIL='Russ Cox <rsc@google.com>'
+env EMAIL='Russ Cox <rsc@google.com>'
 
 bzr init-repo .