| changeset 14123 | 7d1b637738a3 |
| parent 14122 | e83567686d66 |
| child 15132 | 81f76098211e |
| 14122:e83567686d66 | 14123:7d1b637738a3 |
|---|---|
48 These fail: |
48 These fail: |
49 |
49 |
50 $ hg clone -q -u . a a1 |
50 $ hg clone -q -u . a a1 |
51 $ cd a1 |
51 $ cd a1 |
52 |
52 |
53 $ hg rebase -s 8 -d 7 |
|
54 abort: source is descendant of destination |
|
55 [255] |
|
56 |
|
53 $ hg rebase --continue --abort |
57 $ hg rebase --continue --abort |
54 abort: cannot use both abort and continue |
58 abort: cannot use both abort and continue |
55 [255] |
59 [255] |
56 |
60 |
57 $ hg rebase --continue --collapse |
61 $ hg rebase --continue --collapse |