Test suite: drs-push-rejects: Test push of same version with different dgit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/TODO.BRANCH b/TODO.BRANCH
index a81ca5581926ad3a2a03794b2cc737090b0ded42..288a9c78fca812570aa71a859adeced45f7c73c6 100644 (file)
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -15,8 +15,6 @@ Want tests for
    "old" dgit to push again with new tag, push again with
    old tag
 
    "old" dgit to push again with new tag, push again with
    old tag
 

- - rejecting push of same version with one tag when then the other
-

 
  * Provide --gpbpq[=:] options
 
 
  * Provide --gpbpq[=:] options
 

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 07abf4aec8e1cf7dc95755b529a3c9b7965d73d4..f87cbdcbefc5f873b32c74b3b36e830534c30dae 100755 (executable)
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -149,6 +149,12 @@ mustfail 'push is missing head ref update' $push_spec1 +$push_spec2
 git commit --allow-empty -m 'Dummy update'
 mktag
 mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2
 git commit --allow-empty -m 'Dummy update'
 mktag
 mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2

+
+t-newtag
+re-prep
+mktag
+mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2
+

 git reset --hard HEAD~
 
 prep_dm_mangle () {
 git reset --hard HEAD~
 
 prep_dm_mangle () {