##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

fetch: switch the default parent used for a merge...
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
Dirkjan Ochtman - - Load All Authors

File last commit:

r6167:f53b9a38 default
r6206:0b6f1249 default
Show More
test-push-http.out
37 lines | 1.0 KiB | text/plain | TextLexer
/ tests / test-push-http.out
History | Annotation | Raw |Copy content |Copy permalink
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% expect ssl error
pushing to http://localhost/
searching for changes
ssl required
% serve errors
% expect authorization error
pushing to http://localhost/
searching for changes
push not authorized
% serve errors
% expect authorization error: must have authorized user
pushing to http://localhost/
searching for changes
push not authorized
% serve errors
% expect success
pushing to http://localhost/
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
% serve errors
changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http
rolling back last transaction
% expect authorization error: all users denied
pushing to http://localhost/
searching for changes
push not authorized
% serve errors
% expect authorization error: some users denied, users must be authenticated
pushing to http://localhost/
searching for changes
push not authorized
% serve errors