diff options
Diffstat (limited to 'tests/tests/forcesplit-overwrite')
| -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 |