Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Repainted the bikeshed with its original color.
#!/bin/sh
# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update