Mercurial > hg
view tests/test-up-local-change @ 574:af7e21f3b2d9
Update test-diffdir output
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Update test-diffdir output
manifest hash: cd0fb3a3708897fe959852c48de1804fb0b74bf4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxwmcywK+sNU5EO8RAlRCAJ9SBrMQLSRVY1j3V1YO25dGbIN18QCfTbHJ
6/4+xEBX2j3VxUf1g3ayce8=
=kcDR
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 02 Jul 2005 13:39:40 -0800 |
parents | 4fc63e22b1fe |
children | eb46971fc57f |
line wrap: on
line source
#!/bin/sh 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