diff -r 548478efc46c -r bce5ebe72859 tests/test-bookmarks.t --- a/tests/test-bookmarks.t Thu May 04 11:51:07 2017 +0900 +++ b/tests/test-bookmarks.t Mon May 22 19:18:12 2017 -0400 @@ -311,6 +311,15 @@ abort: cannot use an integer as a name [255] +bookmark with a name that matches a node id + $ hg bookmark 925d80f479bb db815d6d32e6 + bookmark 925d80f479bb matches a changeset hash + (did you leave a -r out of an 'hg bookmark' command?) + bookmark db815d6d32e6 matches a changeset hash + (did you leave a -r out of an 'hg bookmark' command?) + $ hg bookmark -d 925d80f479bb + $ hg bookmark -d db815d6d32e6 + incompatible options $ hg bookmark -m Y -d Z