Mercurial > hg
view tests/test-issue619.t @ 51146:de9cbc5a1450 stable
py3: pass unicode strings to hasattr() throughout
I guess we missed these instances because they're not covered by tests.
This is a graft of 1625fe807c04a490f9516bc8e14140e570c06146 that landed on
default.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 13 Nov 2023 09:19:11 -0800 |
parents | 55c6ebd11cb9 |
children |
line wrap: on
line source
https://bz.mercurial-scm.org/619 $ hg init repo $ cd repo $ 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]