merge: handle case when heads are all bookmarks
If all heads are bookmarks, merge fails to find what node to merge
with (throws an IndexError while indexing into the non-bookmark heads
list) as of
4a02cf4fbb2e. This catches that case and prints an error
to specify a rev explicitly.
verify: do not choke on valid changelog without manifest
Before this change:
$ hg init
$ hg branch foo
$ hg ci -m branchfoo
$ hg verify
checking changesets
checking manifests
0: empty or missing manifest
crosschecking files in changesets and manifests
checking files
0 files, 1 changesets, 0 total revisions
1 integrity errors encountered!
(first damaged changeset appears to be 0)
[1]
templater: abort when a template filter raises an exception (
issue2987)
i18n-ru: synchronized with
c6f88e7f95b7
commit: normalize filenames when checking explicit files (
issue3576)
manifest: remove redundant sorted() call for --all
repo.store.datafiles() is now already sorted (for all types of stores).
A follow-up to
4cbb1137941d.