Mercurial > hg
view tests/test-up-local-change @ 331:55f63f3b6a54
Add a simple testing framework
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add a simple testing framework
manifest hash: 9eeea72f2f33438040998a190183958764232ece
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCr0wKywK+sNU5EO8RAl9FAJ4o1QUA/YE2hCSlUPngR8h30hT1xQCgoEhu
um2QkJOc2Rz7i6xTGPxuqzU=
=YyUM
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 14 Jun 2005 13:28:42 -0800 |
parents | |
children | 6c869059beb4 |
line wrap: on
line source
#!/bin/bash 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" cd .. mkdir r2 cd r2 hg init ../r1 hg up echo abc > a hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/" 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 | sed "s/\(\(---\|+++\).*\)\t.*/\1/"