regression test for
issue1552
Ensures that fetch correctly infers what to merge when pulling a
repository with inactive branches.
fetch: do not count inactive branches when inferring a merge
The fetch extension would erroneously consider inactive branches when
inferring which branches to merge. It now considers only active
branches.
exporting patch:
Fixed behavior of revsplit for branch names including the @-symbol.
imported patch
issue1546-hg-bisect-command-doesn-t-work-with-shell-scripts.patch
resolve: move reset to localrepo.commit
This way rebase doesn't leave a stale resolve state