Show More
@@ -182,14 +182,14 b' msgdestmerge = {' | |||||
182 | b"multiple matching bookmarks to merge -" |
|
182 | b"multiple matching bookmarks to merge -" | |
183 | b" please merge with an explicit rev or bookmark" |
|
183 | b" please merge with an explicit rev or bookmark" | |
184 | ), |
|
184 | ), | |
185 | _(b"run 'hg heads' to see all heads"), |
|
185 | _(b"run 'hg heads' to see all heads, specify rev with -r"), | |
186 | ), |
|
186 | ), | |
187 | b'rebase': ( |
|
187 | b'rebase': ( | |
188 | _( |
|
188 | _( | |
189 | b"multiple matching bookmarks to rebase -" |
|
189 | b"multiple matching bookmarks to rebase -" | |
190 | b" please rebase to an explicit rev or bookmark" |
|
190 | b" please rebase to an explicit rev or bookmark" | |
191 | ), |
|
191 | ), | |
192 | _(b"run 'hg heads' to see all heads"), |
|
192 | _(b"run 'hg heads' to see all heads, specify destination with -d"), | |
193 | ), |
|
193 | ), | |
194 | }, |
|
194 | }, | |
195 | # no other matching divergent bookmark |
|
195 | # no other matching divergent bookmark | |
@@ -199,47 +199,47 b' msgdestmerge = {' | |||||
199 | b"no matching bookmark to merge - " |
|
199 | b"no matching bookmark to merge - " | |
200 | b"please merge with an explicit rev or bookmark" |
|
200 | b"please merge with an explicit rev or bookmark" | |
201 | ), |
|
201 | ), | |
202 | _(b"run 'hg heads' to see all heads"), |
|
202 | _(b"run 'hg heads' to see all heads, specify rev with -r"), | |
203 | ), |
|
203 | ), | |
204 | b'rebase': ( |
|
204 | b'rebase': ( | |
205 | _( |
|
205 | _( | |
206 | b"no matching bookmark to rebase - " |
|
206 | b"no matching bookmark to rebase - " | |
207 | b"please rebase to an explicit rev or bookmark" |
|
207 | b"please rebase to an explicit rev or bookmark" | |
208 | ), |
|
208 | ), | |
209 | _(b"run 'hg heads' to see all heads"), |
|
209 | _(b"run 'hg heads' to see all heads, specify destination with -d"), | |
210 | ), |
|
210 | ), | |
211 | }, |
|
211 | }, | |
212 | # branch have too many unbookmarked heads, no obvious destination |
|
212 | # branch have too many unbookmarked heads, no obvious destination | |
213 | b'toomanyheads': { |
|
213 | b'toomanyheads': { | |
214 | b'merge': ( |
|
214 | b'merge': ( | |
215 | _(b"branch '%s' has %d heads - please merge with an explicit rev"), |
|
215 | _(b"branch '%s' has %d heads - please merge with an explicit rev"), | |
216 | _(b"run 'hg heads .' to see heads"), |
|
216 | _(b"run 'hg heads .' to see heads, specify rev with -r"), | |
217 | ), |
|
217 | ), | |
218 | b'rebase': ( |
|
218 | b'rebase': ( | |
219 | _(b"branch '%s' has %d heads - please rebase to an explicit rev"), |
|
219 | _(b"branch '%s' has %d heads - please rebase to an explicit rev"), | |
220 | _(b"run 'hg heads .' to see heads"), |
|
220 | _(b"run 'hg heads .' to see heads, specify destination with -d"), | |
221 | ), |
|
221 | ), | |
222 | }, |
|
222 | }, | |
223 | # branch have no other unbookmarked heads |
|
223 | # branch have no other unbookmarked heads | |
224 | b'bookmarkedheads': { |
|
224 | b'bookmarkedheads': { | |
225 | b'merge': ( |
|
225 | b'merge': ( | |
226 | _(b"heads are bookmarked - please merge with an explicit rev"), |
|
226 | _(b"heads are bookmarked - please merge with an explicit rev"), | |
227 | _(b"run 'hg heads' to see all heads"), |
|
227 | _(b"run 'hg heads' to see all heads, specify rev with -r"), | |
228 | ), |
|
228 | ), | |
229 | b'rebase': ( |
|
229 | b'rebase': ( | |
230 | _(b"heads are bookmarked - please rebase to an explicit rev"), |
|
230 | _(b"heads are bookmarked - please rebase to an explicit rev"), | |
231 | _(b"run 'hg heads' to see all heads"), |
|
231 | _(b"run 'hg heads' to see all heads, specify destination with -d"), | |
232 | ), |
|
232 | ), | |
233 | }, |
|
233 | }, | |
234 | # branch have just a single heads, but there is other branches |
|
234 | # branch have just a single heads, but there is other branches | |
235 | b'nootherbranchheads': { |
|
235 | b'nootherbranchheads': { | |
236 | b'merge': ( |
|
236 | b'merge': ( | |
237 | _(b"branch '%s' has one head - please merge with an explicit rev"), |
|
237 | _(b"branch '%s' has one head - please merge with an explicit rev"), | |
238 | _(b"run 'hg heads' to see all heads"), |
|
238 | _(b"run 'hg heads' to see all heads, specify rev with -r"), | |
239 | ), |
|
239 | ), | |
240 | b'rebase': ( |
|
240 | b'rebase': ( | |
241 | _(b"branch '%s' has one head - please rebase to an explicit rev"), |
|
241 | _(b"branch '%s' has one head - please rebase to an explicit rev"), | |
242 | _(b"run 'hg heads' to see all heads"), |
|
242 | _(b"run 'hg heads' to see all heads, specify destination with -d"), | |
243 | ), |
|
243 | ), | |
244 | }, |
|
244 | }, | |
245 | # repository have a single head |
|
245 | # repository have a single head |
@@ -58,7 +58,7 b'' | |||||
58 | (leaving bookmark e) |
|
58 | (leaving bookmark e) | |
59 | $ hg merge |
|
59 | $ hg merge | |
60 | abort: heads are bookmarked - please merge with an explicit rev |
|
60 | abort: heads are bookmarked - please merge with an explicit rev | |
61 | (run 'hg heads' to see all heads) |
|
61 | (run 'hg heads' to see all heads, specify rev with -r) | |
62 | [255] |
|
62 | [255] | |
63 |
|
63 | |||
64 | # our revision is bookmarked |
|
64 | # our revision is bookmarked | |
@@ -68,7 +68,7 b'' | |||||
68 | (activating bookmark e) |
|
68 | (activating bookmark e) | |
69 | $ hg merge |
|
69 | $ hg merge | |
70 | abort: no matching bookmark to merge - please merge with an explicit rev or bookmark |
|
70 | abort: no matching bookmark to merge - please merge with an explicit rev or bookmark | |
71 | (run 'hg heads' to see all heads) |
|
71 | (run 'hg heads' to see all heads, specify rev with -r) | |
72 | [255] |
|
72 | [255] | |
73 |
|
73 | |||
74 | # merge bookmark heads |
|
74 | # merge bookmark heads | |
@@ -148,5 +148,5 b'' | |||||
148 |
|
148 | |||
149 | $ hg merge |
|
149 | $ hg merge | |
150 | abort: heads are bookmarked - please merge with an explicit rev |
|
150 | abort: heads are bookmarked - please merge with an explicit rev | |
151 | (run 'hg heads' to see all heads) |
|
151 | (run 'hg heads' to see all heads, specify rev with -r) | |
152 | [255] |
|
152 | [255] |
@@ -43,7 +43,7 b' fail with three heads' | |||||
43 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
43 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
44 | $ hg merge |
|
44 | $ hg merge | |
45 | abort: branch 'default' has 3 heads - please merge with an explicit rev |
|
45 | abort: branch 'default' has 3 heads - please merge with an explicit rev | |
46 | (run 'hg heads .' to see heads) |
|
46 | (run 'hg heads .' to see heads, specify rev with -r) | |
47 | [255] |
|
47 | [255] | |
48 |
|
48 | |||
49 | close one of the heads |
|
49 | close one of the heads |
@@ -41,7 +41,7 b' Should fail because > 2 heads:' | |||||
41 | $ HGMERGE=internal:other; export HGMERGE |
|
41 | $ HGMERGE=internal:other; export HGMERGE | |
42 | $ hg merge |
|
42 | $ hg merge | |
43 | abort: branch 'default' has 3 heads - please merge with an explicit rev |
|
43 | abort: branch 'default' has 3 heads - please merge with an explicit rev | |
44 | (run 'hg heads .' to see heads) |
|
44 | (run 'hg heads .' to see heads, specify rev with -r) | |
45 | [255] |
|
45 | [255] | |
46 |
|
46 | |||
47 | Should succeed: |
|
47 | Should succeed: | |
@@ -117,7 +117,7 b' Should fail because merge with other bra' | |||||
117 |
|
117 | |||
118 | $ hg merge |
|
118 | $ hg merge | |
119 | abort: branch 'foobranch' has one head - please merge with an explicit rev |
|
119 | abort: branch 'foobranch' has one head - please merge with an explicit rev | |
120 | (run 'hg heads' to see all heads) |
|
120 | (run 'hg heads' to see all heads, specify rev with -r) | |
121 | [255] |
|
121 | [255] | |
122 |
|
122 | |||
123 |
|
123 | |||
@@ -137,7 +137,7 b' Test experimental destination revset' | |||||
137 |
|
137 | |||
138 | $ hg log -r '_destmerge()' |
|
138 | $ hg log -r '_destmerge()' | |
139 | abort: branch 'foobranch' has one head - please merge with an explicit rev |
|
139 | abort: branch 'foobranch' has one head - please merge with an explicit rev | |
140 | (run 'hg heads' to see all heads) |
|
140 | (run 'hg heads' to see all heads, specify rev with -r) | |
141 | [255] |
|
141 | [255] | |
142 |
|
142 | |||
143 | (on a branch with a two heads) |
|
143 | (on a branch with a two heads) | |
@@ -171,5 +171,5 b' Test experimental destination revset' | |||||
171 |
|
171 | |||
172 | $ hg log -r '_destmerge(foobranch)' |
|
172 | $ hg log -r '_destmerge(foobranch)' | |
173 | abort: branch 'foobranch' has one head - please merge with an explicit rev |
|
173 | abort: branch 'foobranch' has one head - please merge with an explicit rev | |
174 | (run 'hg heads' to see all heads) |
|
174 | (run 'hg heads' to see all heads, specify rev with -r) | |
175 | [255] |
|
175 | [255] |
@@ -318,7 +318,7 b' Implicit merge with test branch as paren' | |||||
318 |
|
318 | |||
319 | $ hg merge |
|
319 | $ hg merge | |
320 | abort: branch 'test' has one head - please merge with an explicit rev |
|
320 | abort: branch 'test' has one head - please merge with an explicit rev | |
321 | (run 'hg heads' to see all heads) |
|
321 | (run 'hg heads' to see all heads, specify rev with -r) | |
322 | [255] |
|
322 | [255] | |
323 | $ hg up -C default |
|
323 | $ hg up -C default | |
324 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
324 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
@@ -327,7 +327,7 b' Implicit merge with default branch as pa' | |||||
327 |
|
327 | |||
328 | $ hg merge |
|
328 | $ hg merge | |
329 | abort: branch 'default' has 3 heads - please merge with an explicit rev |
|
329 | abort: branch 'default' has 3 heads - please merge with an explicit rev | |
330 | (run 'hg heads .' to see heads) |
|
330 | (run 'hg heads .' to see heads, specify rev with -r) | |
331 | [255] |
|
331 | [255] | |
332 |
|
332 | |||
333 | 3 branch heads, explicit merge required: |
|
333 | 3 branch heads, explicit merge required: |
@@ -374,7 +374,7 b" rebase 'c1' to the branch head 'c2' that" | |||||
374 |
|
374 | |||
375 | $ hg rebase |
|
375 | $ hg rebase | |
376 | abort: branch 'c' has one head - please rebase to an explicit rev |
|
376 | abort: branch 'c' has one head - please rebase to an explicit rev | |
377 | (run 'hg heads' to see all heads) |
|
377 | (run 'hg heads' to see all heads, specify destination with -d) | |
378 | [255] |
|
378 | [255] | |
379 | $ hg tglog |
|
379 | $ hg tglog | |
380 | _ 4: 8427af5d86f2 'c2 closed' c |
|
380 | _ 4: 8427af5d86f2 'c2 closed' c |
@@ -85,7 +85,7 b' These fail:' | |||||
85 |
|
85 | |||
86 | $ hg rebase --base 6 |
|
86 | $ hg rebase --base 6 | |
87 | abort: branch 'default' has 3 heads - please rebase to an explicit rev |
|
87 | abort: branch 'default' has 3 heads - please rebase to an explicit rev | |
88 | (run 'hg heads .' to see heads) |
|
88 | (run 'hg heads .' to see heads, specify destination with -d) | |
89 | [255] |
|
89 | [255] | |
90 |
|
90 | |||
91 | $ hg rebase --rev '1 & !1' --dest 8 |
|
91 | $ hg rebase --rev '1 & !1' --dest 8 |
General Comments 0
You need to be logged in to leave comments.
Login now