Use nullrev+count instead of count-1 in a newly introduced expression.
Before that repo.changelog.tip() was used, but this yields a node.
Of course many more places should be changed like this, this was just done
as an example.
#!/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