Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 507:dd8b19114fe7
README: mention lib64/
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
README: mention lib64/
manifest hash: 66865206771f64e1257235c8cf551edf77d2712c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwSemywK+sNU5EO8RAn/kAJ9NhZLCNdOI09rSL22p6zVsoMLyXACdGzVh
6hfXMuxEjn84xTLS4xJ2OLo=
=VQie
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 28 Jun 2005 02:34:14 -0800 |
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