view tests/test-push-http.out @ 7785:660c8dd44060

test-merge-tool: Make sure no hgmerge can be found in $PATH

The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.

adding a
updating working directory
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
abort: authorization failed
pushing to http://localhost/
searching for changes
% serve errors
% expect authorization error: must have authorized user
abort: authorization failed
pushing to http://localhost/
searching for changes
% 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
abort: authorization failed
pushing to http://localhost/
searching for changes
% serve errors
% expect authorization error: some users denied, users must be authenticated
abort: authorization failed
pushing to http://localhost/
searching for changes
% serve errors