view tests/test-issue619.t @ 40382:bd1ec1e36bf0

tests: add coverage for some untested areas of hgweb

The fact that these mimetype guesses weren't blowing up anywhere on py3 prior to
9310037f0636 was the giveaway.  The annotate function is a bit unusual in that
it renders the page with a 500 in the middle, so I left the HTML output.  For
the other functions, checking the access log is enough.

https://bz.mercurial-scm.org/619

  $ hg init
  $ echo a > a
  $ hg ci -Ama
  adding a

  $ echo b > b
  $ hg branch b
  marked working directory as branch b
  (branches are permanent and global, did you want a bookmark?)
  $ hg ci -Amb
  adding b

  $ hg co -C 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

Fast-forward:

  $ hg merge b
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ hg ci -Ammerge

Bogus fast-forward should fail:

  $ hg merge b
  abort: merging with a working directory ancestor has no effect
  [255]

Even with strange revset (issue4465)

  $ hg merge ::.
  abort: merging with a working directory ancestor has no effect
  [255]