diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-18 18:58:05 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-28 23:40:43 +0100 |
commit | 16f71c0bfd026cafacd9a5fad1404e457ae55b78 (patch) | |
tree | 58fe599fc03bbf33314ccc5af29f156d306f6978 /tests/tests | |
parent | 0e7aa587520399fcba122b4d91453bf4ec19e20d (diff) |
test suite: forcesplit-overwrite: Check -pushed-good
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
-rwxr-xr-x | tests/tests/forcesplit-overwrite | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/tests/forcesplit-overwrite b/tests/tests/forcesplit-overwrite index 0afb5ce..d07d65a 100755 --- a/tests/tests/forcesplit-overwrite +++ b/tests/tests/forcesplit-overwrite @@ -2,14 +2,25 @@ set -e . tests/lib +# This tests a native package with split view, including that the +# pseudomerges end up in the right place. + t-setup-import examplegit +t-select-package example cd example suite=stable t-commit 'No changes, just send to stable' '' stable -t-dgit -wgf --split-view --overwrite=1.2 push-source stable +t-refs-same-start +t-ref-head + +t-dgit -wgf --split-view --overwrite=1.2 --dgit-view-save=split.p push-source stable +git branch -f split.b split.p + +t-ref-head +t-split-unchanged-pushed-good $suite t-ok |