view tests/test-mq-qpush-fail.out @ 9954:d6a307719ccb stable

fix bug in prepush logic involving merge changesets

When creating new branches and merging them into existing ones, you would
sometimes be able to push some changesets (the existing branches) without using
--force, even when that creates a new head on the remote.

A test which triggers the error has been added.

adding foo
% test qpush on empty series
no patches in series
popping bad-patch
popping patch2
popping patch1
patch queue now empty
applying patch1
applying patch2
applying bad-patch
transaction abort!
rollback completed
cleaning up working directory...done
abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)!
changeset:   0:bbd179dfa0a7
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo

% bar should be gone; other unknown/ignored files should still be around
? untracked-file
I .hgignore
C foo
% preparing qpush of a missing patch
no patches applied
applying patch1
now at: patch1
% now we expect the push to fail, but it should NOT complain about patch1
applying patch2
unable to read patch2
now at: patch1
% preparing qpush of missing patch with no patch applied
popping patch1
patch queue now empty
% qpush should fail the same way as below
applying patch1
unable to read patch1