Merge tag 'debian/7.0' into stretch-bpo

dgit release 7.0 for unstable (sid) [dgit]
[dgit distro=debian]

# gpg: Signature made Thu 04 Oct 2018 12:36:14 PM MST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

1 files changed, 41 insertions, 0 deletions

diff --git a/tests/tests/i18n-messages b/tests/tests/i18n-messages
new file mode 100755
index 0000000..f2aaa87
--- /dev/null
+++ b/tests/tests/i18n-messages
@@ -0,0 +1,41 @@
+#!/bin/bash
+set -e
+autoimport=
+. tests/lib
+
+t-dependencies NO-DGIT GDR
+t-restrict x-dgit-out-of-tree-only
+# We don't run this test in-tree because:
+#  1. The .mo files that we would use might need to be built
+#     and would certainly have to be `installed' somewhere we
+#     could reference them.  We could do that here maybe,
+#     but it would risk dirtying the tree because the i18n
+#     machinery is dirtying, and also:
+#  2. The locale system does not provide a path-like variable
+#     we could use to point to our not-yet-installed .mo files.
+#     There is LOCPATH but setting it breaks everything because
+#     it disables `locale archives' and those are what provides
+#     important infrastructure.
+
+t-setup-import gdr-convert-gbp-noarchive
+
+cd $p
+
+t-gdr-prep-new-upstream 2.1
+git tag v2.1 upstream
+
+git branch startpoint
+v=2.1-1
+
+git checkout master
+
+anchor=$(t-git-debrebase anchor)
+
+t-expect-fail F:'old anchor is recognised' \
+t-git-debrebase --anchor=$anchor new-upstream 2.1
+
+expect_fail_lcmessages=en_US.UTF-8
+t-expect-fail F:'old anchor is recognized' \
+t-git-debrebase --anchor=$anchor new-upstream 2.1
+
+t-ok