Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 861:cbe5c4d016b7
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Interface is not yet changed.
Non-regular files are considered to be removed or deleted.
Removed the unneeded match(fn) call for adding to the unknown list.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 09 Aug 2005 11:32:30 +0100 |
parents | 0902ffece4b4 |
children | d997148155f2 52d8d81e72ad 4f81068ed8cd |
line wrap: on
line source
#!/bin/sh set -e 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/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\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/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d