Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | 7e4843b7efd2 6592c4f5cd4f |
children | ec85f9e6f3b1 |
line wrap: on
line source
#!/bin/sh set -ex mkdir r1 cd r1 hg init echo a > a hg addremove hg commit -m "1" -d "0 0" hg clone . ../r2 cd ../r2 hg up echo abc > a hg diff > ../d sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d cd ../r1 echo b > b echo a2 > a hg addremove hg commit -m "2" -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]*\)[ \t].*/\1/" < ../d