diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-09-03 21:28:39 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-09-03 21:28:39 -0700 |
| commit | cc704da52293859135140d783697360b55ea34a5 (patch) | |
| tree | 7ca5bdb2177cb05a798d4ac8d292057a2c3abcf1 /tests/tests/gdr-edits | |
| parent | 29176533eff12cd3e90e3a3ce60e59ec1077b2ac (diff) | |
| parent | 80660b109ae671e5164c6738919f34db06719236 (diff) | |
Merge tag 'debian/6.11' into stretch-bpo
dgit release 6.11 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sun 26 Aug 2018 01:58:34 PM MST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'tests/tests/gdr-edits')
| -rwxr-xr-x | tests/tests/gdr-edits | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index 124de29..0bdf15f 100755 --- a/tests/tests/gdr-edits +++ b/tests/tests/gdr-edits @@ -38,4 +38,11 @@ t-refs-same-start t-ref-same refs/heads/before-noop t-ref-head +git checkout -b some-new-branch +t-some-changes 2nd-maintainer +t-dgit quilt-fixup +t-gdr-made-patches +# NB quilt-fixup doesn't always manage to call gdr; +# push does, since it will make the pseudomerge first + t-ok |