##// END OF EJS Templates
bookmarks: fix head selection for merge with two bookmarked heads...
Mads Kiilerich -
r18122:730b769f stable
parent child Browse files
Show More
@@ -4288,7 +4288,7 b' def merge(ui, repo, node=None, **opts):'
4288 4288
4289 4289 if not node and repo._bookmarkcurrent:
4290 4290 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4291 curhead = repo[repo._bookmarkcurrent]
4291 curhead = repo[repo._bookmarkcurrent].node()
4292 4292 if len(bmheads) == 2:
4293 4293 if curhead == bmheads[0]:
4294 4294 node = bmheads[1]
@@ -75,9 +75,27 b''
75 75 $ echo f > f
76 76 $ hg commit -Am "f"
77 77 adding f
78 $ hg bookmarks -r 4 "e@diverged"
79 $ hg up -q -C "e@diverged"
80 $ hg merge
81 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
82 (branch merge, don't forget to commit)
83 $ hg parents
84 changeset: 4:a0546fcfe0fb
85 bookmark: e@diverged
86 user: test
87 date: Thu Jan 01 00:00:00 1970 +0000
88 summary: d
89
90 changeset: 5:26bee9c5bcf3
91 bookmark: e
92 parent: 3:b8f96cf4688b
93 user: test
94 date: Thu Jan 01 00:00:00 1970 +0000
95 summary: e
96
78 97 $ hg up -C e
79 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
80 $ hg bookmarks -r 4 "e@diverged"
98 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
81 99 $ hg bookmarks
82 100 b 1:d2ae7f538514
83 101 c 3:b8f96cf4688b
General Comments 0
You need to be logged in to leave comments. Login now