Mercurial > hg
view tests/test-push-http.out @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
parents | 5c65b4e51610 |
children | 109a22f5434a |
line wrap: on
line source
adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % expect ssl error pushing to http://localhost:20059/ searching for changes ssl required % expect authorization error pushing to http://localhost:20059/ searching for changes push not authorized % expect authorization error: must have authorized user pushing to http://localhost:20059/ searching for changes push not authorized % expect success pushing to http://localhost:20059/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files rolling back last transaction % expect authorization error: all users denied pushing to http://localhost:20059/ searching for changes push not authorized % expect authorization error: some users denied, users must be authenticated pushing to http://localhost:20059/ searching for changes push not authorized