Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 340:97a897d32dfc
Handle the case where the current working copy is not based on a checkout.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Handle the case where the current working copy is not based on a checkout.
Print 'unknown' in verbose mode and nothing otherwise.
manifest hash: 5742c3c3a762b77ee1aeb62ed53b8f2d8e47a05d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCr8WJW7P1GVgWeRoRAtNkAJ9Qea4u8GG8zdSk87qLApT88KMrgQCeO22w
bJ12ieVHvLzc2NNAGV+zbeQ=
=IYni
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 15 Jun 2005 07:07:05 +0100 |
parents | 6c869059beb4 |
children | b2293093b89e b4e0e20646bb |
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