Mercurial > hg
view tests/test-issue619.t @ 45948:250e18437e30
tests: add a comment that we're purposely testing py2 extension attributes
Avoid someone unknowingly removing test coverage. There are tests for a
properly byteified `testedwith` a few lines down. I don't see similar for
`buglink`, but it's a trivial conversion to bytes, so I'm not concerned about
testing the expected/wanted extension state.
Differential Revision: https://phab.mercurial-scm.org/D9434
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 27 Nov 2020 15:00:39 -0500 |
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]