Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-webraw @ 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 | d75c68b55af8 |
children | 83cfd95eafb5 |
line wrap: on
line source
#!/bin/sh hg init test cd test cat >sometext.txt <<ENDSOME This is just some random text that will go inside the file and take a few lines. It is very boring to read, but computers don't care about things like that. ENDSOME hg add sometext.txt hg commit -d "1 0" -m "Just some text" hg serve -p 20059 -A access.log -E error.log -d --pid-file=hg.pid ("$TESTDIR/get-with-headers.py" localhost:20059 '/?f=f165dc289438;file=sometext.txt;style=raw' content-type content-length content-disposition) >getoutput.txt & sleep 5 kill `cat hg.pid` sleep 1 # wait for server to scream and die cat getoutput.txt cat access.log error.log | \ sed 's/^[^ ]*\( [^[]*\[\)[^]]*\(\].*\)$/host\1date\2/'