Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 418:0446f698d38e
Minor tweak to binary mode patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Minor tweak to binary mode patch
manifest hash: 4fce0b7b405b124e035526d4a458e888d9bd82ef
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNr1ywK+sNU5EO8RAs83AJ9i+yafrjWWjWm1lTwCr0fO8cAU+gCghmxg
+S1W1KuMzgxJAtuhq6h6uBk=
=9JhP
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 19:28:53 -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