Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 543:61ead26cb8f0
Updated TODO
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Updated TODO
manifest hash: 007f50cbf11632362229853439d2610a1ad3f989
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCxF+7W7P1GVgWeRoRAg8MAJ9k3HXkpmHk3SRYw9FiqfHh8sEDFQCfc5il
2T+hyWgBwBTTHYpBeujq/20=
=cRVv
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 30 Jun 2005 22:10:19 +0100 |
parents | c5705ab9cebd |
children | 3d4d5f2aba9a 4fc63e22b1fe |
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" hg clone . ../r2 cd ../r2 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