Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-push-http @ 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 | 83cfd95eafb5 |
line wrap: on
line source
#!/bin/sh hg init test cd test echo a > a hg ci -Ama cd .. hg clone test test2 cd test2 echo a >> a hg ci -mb cd ../test echo % expect ssl error hg serve -p 20059 -d --pid-file=hg.pid hg --cwd ../test2 push http://localhost:20059/ kill `cat hg.pid` echo % expect authorization error echo '[web]' > .hg/hgrc echo 'push_ssl = false' >> .hg/hgrc hg serve -p 20059 -d --pid-file=hg.pid hg --cwd ../test2 push http://localhost:20059/ kill `cat hg.pid` echo % expect authorization error: must have authorized user echo 'allow_push = unperson' >> .hg/hgrc hg serve -p 20059 -d --pid-file=hg.pid hg --cwd ../test2 push http://localhost:20059/ kill `cat hg.pid` echo % expect success echo 'allow_push = *' >> .hg/hgrc hg serve -p 20059 -d --pid-file=hg.pid hg --cwd ../test2 push http://localhost:20059/ kill `cat hg.pid` hg rollback echo % expect authorization error: all users denied echo 'deny_push = *' >> .hg/hgrc hg serve -p 20059 -d --pid-file=hg.pid hg --cwd ../test2 push http://localhost:20059/ kill `cat hg.pid` echo % expect authorization error: some users denied, users must be authenticated echo 'deny_push = unperson' >> .hg/hgrc hg serve -p 20059 -d --pid-file=hg.pid hg --cwd ../test2 push http://localhost:20059/ kill `cat hg.pid`