Improvements for hg identify:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Improvements for hg identify:
Don't add the modified flag if unknown files are found.
Remove extra space if there was no tag found.
Multiple tags for a single parent separated by '/'.
Getting rid of sum() to aid porting to Python 2.2.
manifest hash: f91224afcb239908ba3ef02299fcf2b0380ebd1a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCspWvW7P1GVgWeRoRAnqbAJwL1DIzOxOrdqpPj9vsYJeeiq+VrQCcCyli
P+b/S0s2n628ku1IfrW3Elo=
=lgRY
-----END PGP SIGNATURE-----
#!/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"
cd ..
mkdir r2
cd r2
hg init ../r1
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