Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 352:ca39b80cbe15
ignore files associated with quilt
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
ignore files associated with quilt
manifest hash: f0da2c0465fb27005d5bde30e0171ae9a76951d0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsGpIywK+sNU5EO8RAi+uAJ4/cXWFBnXoLHH8bN8Xbe/nzXHycgCfQkO2
WdEoWI4YpiNQ+s5id6Xxphw=
=6cXJ
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 15 Jun 2005 09:50:00 -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