Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 1834:24881eaebee3
Fixes running 'hg serve' with Windows executable and no explicit template path configured.
PY2EXE executables don't support __file__ but do place the directory of the
shared code library into sys.prefix.
Fixes bug 152.
author | Lee Cantey <lcantey@gmail.com> |
---|---|
date | Fri, 03 Mar 2006 13:41:12 -0800 |
parents | dee55c4a4963 |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh set -e mkdir r1 cd r1 hg init echo a > a hg addremove hg commit -m "1" -d "0 0" hg clone . ../r2 cd ../r2 hg up echo abc > a hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" cd ../r1 echo b > b echo a2 > a hg addremove hg commit -m "2" -d "0 0" cd ../r2 hg -q pull ../r1 hg status hg parents hg --debug up hg parents hg --debug up 0 hg parents hg --debug up -m || echo failed hg parents hg --debug up hg parents hg -v history hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" # create a second head cd ../r1 hg up 0 echo b2 > b echo a3 > a hg addremove hg commit -m "3" -d "0 0" cd ../r2 hg -q pull ../r1 hg status hg parents hg --debug up || echo failed hg --debug up -m || echo failed hg --debug up -f -m hg parents hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"