Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change @ 349:b2293093b89e
Merged with mercurial-identify (which includes upstream's current tip)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merged with mercurial-identify (which includes upstream's current tip)
manifest hash: b135d201757b84bbe7f14a446d2b001fd0cc1aa2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCr9mNW7P1GVgWeRoRAmTjAJ919wnvZXbKI27N0cDJCrumR3z4rQCcD6PO
yZTmrT6p+gt6GBO+j5FVBn0=
=HWn8
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 15 Jun 2005 08:32:29 +0100 |
parents | 6c869059beb4 |
children | b4e0e20646bb |
line wrap: on
line diff
new file mode 100755 --- /dev/null +++ b/tests/test-up-local-change @@ -0,0 +1,37 @@ +#!/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 +