Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 471:4c7f687e4313
Minor annotate performance tweaks
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Minor annotate performance tweaks
manifest hash: 2edd508182c7b3dfb2e0b9b90baebdd364cb29f0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvfQeywK+sNU5EO8RAsYSAJ0R8SuWnyQxVgauoaEuezOe3Taq/wCbBnEs
+VG0LNrXnQM9khQyc0+pCeg=
=U5gX
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 25 Jun 2005 16:17:34 -0800 |
parents | b4e0e20646bb |
children | c5705ab9cebd |
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 > ../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