diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 23:25:48 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 23:43:08 +0100 |
| commit | 8f28dfa084b6d63e385d7fe538214eee2f90ea9e (patch) | |
| tree | 6af6b90b3c12ff02ab8a2c718e4f0e09249a3885 /tests/tests | |
| parent | 3367a5049a0032c13023bdb930c0c80bc326c49c (diff) | |
git-debrebase: Snag on repeated conversions
If debrebase-last says we are ahead of some previous gdr work, it is
carrying on is unlikely to be helpful. It would only be sensible if
the package is vacillating between branch formats, and this is
reflected and visible in the branch history.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
| -rwxr-xr-x | tests/tests/gdr-import-dgitview | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/tests/gdr-import-dgitview b/tests/tests/gdr-import-dgitview index 3670deb..18d06f5 100755 --- a/tests/tests/gdr-import-dgitview +++ b/tests/tests/gdr-import-dgitview @@ -38,7 +38,8 @@ t-ref-head t-git-debrebase --noop-ok convert-from-dgit-view t-ref-head -t-git-debrebase convert-from-dgit-view --always-convert-anyway +t-git-debrebase -falready-converted convert-from-dgit-view \ + --always-convert-anyway t-expect-fail E:'ref varies' t-ref-head t-gdr-good laundered |