Mercurial > hg
view tests/test-issue619.t @ 28996:b74ca9ace65e stable
tests: tolerate http2
You can run tests like this:
run-tests.py -l --extra-config-opt ui.usehttp2=true
And ideally, no tests should fail...
author | timeless <timeless@mozdev.org> |
---|---|
date | Thu, 21 Apr 2016 04:30:18 +0000 |
parents | 2fc86d92c4a9 |
children | 55c6ebd11cb9 |
line wrap: on
line source
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]