Mercurial > hg-stable
view tests/test-up-local-change @ 544:3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Remove bashisms and use /bin/sh instead of /bin/bash.
manifest hash: 25560e04ff8ac33a6d8b82d2328b4e90578bee4c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCxOEjW7P1GVgWeRoRAm9XAJ9IjlbMerPYEhKQQu7Ufcm6630cDwCfdXJ3
865XH6YVMuCYNjf3eibwQaM=
=r3gh
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 01 Jul 2005 07:22:27 +0100 |
parents | c5705ab9cebd |
children | 4fc63e22b1fe |
line wrap: on
line source
#!/bin/sh export HGMERGE=true set -ex mkdir r1 cd r1 hg init echo a > a hg addremove hg commit -t "1" -u test -d "0 0" hg clone . ../r2 cd ../r2 hg up echo abc > a hg diff > ../d sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d cd ../r1 echo b > b echo a2 > a hg addremove hg commit -t "2" -u test -d "0 0" cd ../r2 hg -q pull ../r1 hg status hg -d up hg -d up -m hg parents hg -v history hg diff > ../d sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d