Mercurial > hg-stable
changeset 17689:aa0647830fd9
Merge
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Mon, 01 Oct 2012 21:54:04 +0200 |
| parents | f4bed9b57858 (current diff) 6e4b962600a3 (diff) |
| children | eb7f8359249a |
| files | |
| diffstat | 3 files changed, 25 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Sep 27 01:53:28 2012 +0200 +++ b/mercurial/commands.py Mon Oct 01 21:54:04 2012 +0200 @@ -833,7 +833,7 @@ raise util.Abort( _("a bookmark cannot have the name of an existing branch")) if rev: - marks[mark] = repo.lookup(rev) + marks[mark] = scmutil.revsingle(repo, rev).node() else: marks[mark] = cur if not inactive and cur == marks[mark]:
--- a/mercurial/help/config.txt Thu Sep 27 01:53:28 2012 +0200 +++ b/mercurial/help/config.txt Mon Oct 01 21:54:04 2012 +0200 @@ -923,6 +923,17 @@ Optional. Directory or URL to use when pushing if no destination is specified. +Custom paths can be defined by assigning the path to a name that later can be +used from the command line. Example:: + + [paths] + my_path = http://example.com/path + +To push to the path defined in ``my_path`` run the command:: + + hg push my_path + + ``phases`` ----------
--- a/tests/test-bookmarks.t Thu Sep 27 01:53:28 2012 +0200 +++ b/tests/test-bookmarks.t Mon Oct 01 21:54:04 2012 +0200 @@ -154,6 +154,19 @@ * Y 2:db815d6d32e6 Z 0:f7b1eb17ad24 +bookmarks from a revset + $ hg bookmark -r '.^1' REVSET + $ hg bookmark -r ':tip' TIP + $ hg bookmarks + REVSET 0:f7b1eb17ad24 + * TIP 2:db815d6d32e6 + X2 1:925d80f479bb + Y 2:db815d6d32e6 + Z 0:f7b1eb17ad24 + + $ hg bookmark -d REVSET + $ hg bookmark -d TIP + rename without new name $ hg bookmark -m Y