Mercurial > hg
view tests/test-up-local-change @ 473:5914e27dc717
[PATCH] Get run-tests working on 64-bit machines.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Get run-tests working on 64-bit machines.
From: Bryan O'Sullivan <bos@serpentine.com>
manifest hash: 3704997be1744478414cddcd79c7bea5ccd6a1b1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvfdvywK+sNU5EO8RAm5iAJ9mWxI4o2j7IM7Mko7IjfKfNtWJqwCcDekn
6GDlcDo/Q3nv8ybFzykwQjY=
=tS2i
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 25 Jun 2005 16:31:43 -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