view tests/test-serve.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.

% Without -v
access log created - .hg/hgrc respected
% errors
% With -v
listening at http://localhost/ (bound to 127.0.0.1)
% errors
% With --prefix foo
listening at http://localhost/foo/ (bound to 127.0.0.1)
% errors
% With --prefix /foo
listening at http://localhost/foo/ (bound to 127.0.0.1)
% errors
% With --prefix foo/
listening at http://localhost/foo/ (bound to 127.0.0.1)
% errors
% With --prefix /foo/
listening at http://localhost/foo/ (bound to 127.0.0.1)
% errors