##// END OF EJS Templates
bookmarks: warn about bookmark names that unambiguously resolve to a node (BC)...
Augie Fackler -
r32451:bce5ebe7 default
parent child Browse files
Show More
@@ -968,6 +968,11 b' def bookmark(ui, repo, *names, **opts):'
968 and not force):
968 and not force):
969 raise error.Abort(
969 raise error.Abort(
970 _("a bookmark cannot have the name of an existing branch"))
970 _("a bookmark cannot have the name of an existing branch"))
971 if len(mark) > 3 and mark in repo and not force:
972 repo.ui.warn(
973 _("bookmark %s matches a changeset hash\n"
974 "(did you leave a -r out of an 'hg bookmark' command?)\n") %
975 mark)
971
976
972 if delete and rename:
977 if delete and rename:
973 raise error.Abort(_("--delete and --rename are incompatible"))
978 raise error.Abort(_("--delete and --rename are incompatible"))
@@ -311,6 +311,15 b' bookmark with integer name'
311 abort: cannot use an integer as a name
311 abort: cannot use an integer as a name
312 [255]
312 [255]
313
313
314 bookmark with a name that matches a node id
315 $ hg bookmark 925d80f479bb db815d6d32e6
316 bookmark 925d80f479bb matches a changeset hash
317 (did you leave a -r out of an 'hg bookmark' command?)
318 bookmark db815d6d32e6 matches a changeset hash
319 (did you leave a -r out of an 'hg bookmark' command?)
320 $ hg bookmark -d 925d80f479bb
321 $ hg bookmark -d db815d6d32e6
322
314 incompatible options
323 incompatible options
315
324
316 $ hg bookmark -m Y -d Z
325 $ hg bookmark -m Y -d Z
General Comments 0
You need to be logged in to leave comments. Login now