Mercurial > hg
changeset 18133:7f5a0eba3768
merge with stable
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Wed, 26 Dec 2012 11:16:18 -0600 |
| parents | db25bf1dc828 (current diff) 730b769fb634 (diff) |
| children | 6c35b53cd28b |
| files | mercurial/commands.py |
| diffstat | 2 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Dec 24 02:49:59 2012 +0100 +++ b/mercurial/commands.py Wed Dec 26 11:16:18 2012 -0600 @@ -4360,7 +4360,7 @@ if not node and repo._bookmarkcurrent: bmheads = repo.bookmarkheads(repo._bookmarkcurrent) - curhead = repo[repo._bookmarkcurrent] + curhead = repo[repo._bookmarkcurrent].node() if len(bmheads) == 2: if curhead == bmheads[0]: node = bmheads[1]
--- a/tests/test-bookmarks-merge.t Mon Dec 24 02:49:59 2012 +0100 +++ b/tests/test-bookmarks-merge.t Wed Dec 26 11:16:18 2012 -0600 @@ -75,9 +75,27 @@ $ echo f > f $ hg commit -Am "f" adding f + $ hg bookmarks -r 4 "e@diverged" + $ hg up -q -C "e@diverged" + $ hg merge + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ hg parents + changeset: 4:a0546fcfe0fb + bookmark: e@diverged + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: d + + changeset: 5:26bee9c5bcf3 + bookmark: e + parent: 3:b8f96cf4688b + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: e + $ hg up -C e - 1 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ hg bookmarks -r 4 "e@diverged" + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bookmarks b 1:d2ae7f538514 c 3:b8f96cf4688b