Merge with main
test-remove is still failing for status() does not return removed files in a
sorted list. We can live with this for now, a fix is coming soon.
localrepo: fix status() typos from
854b907527e5a and
97c12b1ed1e0
dirstate: fix _droppath() typo from
80605a8127e0