Mercurial > hg
comparison tests/test-rebase-scenario-global.t @ 46632:9989a276712f
errors: use more specific errors in rebase extension
Differential Revision: https://phab.mercurial-scm.org/D9914
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 29 Jan 2021 16:33:12 -0800 |
| parents | b4694ef45db5 |
| children | 80cac9936324 |
comparison
equal
deleted
inserted
replaced
| 46631:230f73019e49 | 46632:9989a276712f |
|---|---|
| 264 | 264 |
| 265 F onto G - rebase onto a descendant: | 265 F onto G - rebase onto a descendant: |
| 266 | 266 |
| 267 $ hg rebase -s 5 -d 6 | 267 $ hg rebase -s 5 -d 6 |
| 268 abort: source and destination form a cycle | 268 abort: source and destination form a cycle |
| 269 [255] | 269 [10] |
| 270 | 270 |
| 271 G onto B - merge revision with both parents not in ancestors of target: | 271 G onto B - merge revision with both parents not in ancestors of target: |
| 272 | 272 |
| 273 $ hg rebase -s 6 -d 1 | 273 $ hg rebase -s 6 -d 1 |
| 274 rebasing 6:eea13746799a "G" | 274 rebasing 6:eea13746799a "G" |
| 275 abort: cannot rebase 6:eea13746799a without moving at least one of its parents | 275 abort: cannot rebase 6:eea13746799a without moving at least one of its parents |
| 276 [255] | 276 [10] |
| 277 $ hg rebase --abort | 277 $ hg rebase --abort |
| 278 rebase aborted | 278 rebase aborted |
| 279 | 279 |
| 280 These will abort gracefully (using --base): | 280 These will abort gracefully (using --base): |
| 281 | 281 |