Show More
@@ -194,8 +194,9 b' def rebase(ui, repo, **opts):' | |||||
194 | if not rebaseset: |
|
194 | if not rebaseset: | |
195 | repo.ui.debug('base is ancestor of destination\n') |
|
195 | repo.ui.debug('base is ancestor of destination\n') | |
196 | result = None |
|
196 | result = None | |
197 | elif not keepf and repo.revs('first(children(%ld) - %ld)-hidden()', |
|
197 | elif (not (keepf or obsolete._enabled) | |
198 | rebaseset, rebaseset): |
|
198 | and repo.revs('first(children(%ld) - %ld)-hidden()', | |
|
199 | rebaseset, rebaseset)): | |||
199 | raise util.Abort( |
|
200 | raise util.Abort( | |
200 | _("can't remove original changesets with" |
|
201 | _("can't remove original changesets with" | |
201 | " unrebased descendants"), |
|
202 | " unrebased descendants"), |
@@ -279,4 +279,30 b' not be rebased.' | |||||
279 | 32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 {'date': '*', 'user': 'test'} (glob) |
|
279 | 32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 {'date': '*', 'user': 'test'} (glob) | |
280 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 {'date': '*', 'user': 'test'} (glob) |
|
280 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 {'date': '*', 'user': 'test'} (glob) | |
281 |
|
281 | |||
282 | $ cd .. |
|
282 | Test ui.prevent-unstable option | |
|
283 | ------------------------------------ | |||
|
284 | ||||
|
285 | $ hg log -r 'children(8)' | |||
|
286 | 9:cf44d2f5a9f4 D (no-eol) | |||
|
287 | $ hg rebase -r 8 | |||
|
288 | $ hg log -G | |||
|
289 | @ 11:0d8f238b634c C | |||
|
290 | | | |||
|
291 | o 10:7c6027df6a99 B | |||
|
292 | | | |||
|
293 | | o 9:cf44d2f5a9f4 D | |||
|
294 | | | | |||
|
295 | | x 8:e273c5e7d2d2 C | |||
|
296 | | | | |||
|
297 | o | 7:02de42196ebe H | |||
|
298 | | | | |||
|
299 | | o 6:eea13746799a G | |||
|
300 | |/| | |||
|
301 | o | 5:24b6387c8c8c F | |||
|
302 | | | | |||
|
303 | | o 4:9520eea781bc E | |||
|
304 | |/ | |||
|
305 | o 0:cd010b8cd998 A | |||
|
306 | ||||
|
307 | ||||
|
308 |
General Comments 0
You need to be logged in to leave comments.
Login now