##// END OF EJS Templates
tests: merging bookmarked heads...
John Li -
r17394:19e4861f stable
parent child Browse files
Show More
@@ -91,3 +91,38 b''
91 b 1:d2ae7f538514
91 b 1:d2ae7f538514
92 c 3:b8f96cf4688b
92 c 3:b8f96cf4688b
93 * e 7:ca784329f0ba
93 * e 7:ca784329f0ba
94
95 # test warning when all heads are inactive bookmarks
96
97 $ hg up -C 6
98 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
99 $ echo g > g
100 $ hg commit -Am 'g'
101 adding g
102 $ hg bookmark -i g
103 $ hg bookmarks
104 b 1:d2ae7f538514
105 c 3:b8f96cf4688b
106 e 7:ca784329f0ba
107 g 8:04dd21731d95
108 $ hg heads
109 changeset: 8:04dd21731d95
110 bookmark: g
111 tag: tip
112 parent: 6:be381d1126a0
113 user: test
114 date: Thu Jan 01 00:00:00 1970 +0000
115 summary: g
116
117 changeset: 7:ca784329f0ba
118 bookmark: e
119 parent: 5:26bee9c5bcf3
120 parent: 4:a0546fcfe0fb
121 user: test
122 date: Thu Jan 01 00:00:00 1970 +0000
123 summary: merge
124
125 $ hg merge
126 abort: heads are bookmarked - please merge with an explicit rev
127 (run 'hg heads' to see all heads)
128 [255]
General Comments 0
You need to be logged in to leave comments. Login now