Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 691:61c6b4178b9e
HG environment variables take precedence over hgrc
manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810
author | mpm@selenic.com |
---|---|
date | Wed, 13 Jul 2005 01:48:03 -0800 |
parents | eb46971fc57f |
children | 7e4843b7efd2 |
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 --debug up hg --debug up -m hg parents hg -v history hg diff > ../d sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d