Mercurial > hg
comparison tests/test-histedit-base.t @ 27545:a67d2e059a51
histedit: use parse-error exception for parsing
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Sun, 27 Dec 2015 03:33:09 +0000 |
| parents | 11be6b7f95da |
| children | dcbba68e076f |
comparison
equal
deleted
inserted
replaced
| 27544:a4f008612727 | 27545:a67d2e059a51 |
|---|---|
| 227 > base d273e35dcdf2 B | 227 > base d273e35dcdf2 B |
| 228 > pick e8c55b19d366 J | 228 > pick e8c55b19d366 J |
| 229 > base d273e35dcdf2 B | 229 > base d273e35dcdf2 B |
| 230 > pick b2f90fd8aa85 I | 230 > pick b2f90fd8aa85 I |
| 231 > EOF | 231 > EOF |
| 232 abort: may not use "base" with changesets within the edited list | 232 hg: parse error: may not use "base" with changesets within the edited list |
| 233 | 233 |
| 234 $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle | 234 $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle |
| 235 > base cd010b8cd998 A | 235 > base cd010b8cd998 A |
| 236 > pick d273e35dcdf2 B | 236 > pick d273e35dcdf2 B |
| 237 > pick 03772da75548 X | 237 > pick 03772da75548 X |
| 238 > pick b2f90fd8aa85 I | 238 > pick b2f90fd8aa85 I |
| 239 > pick e8c55b19d366 J | 239 > pick e8c55b19d366 J |
| 240 > EOF | 240 > EOF |
| 241 abort: unknown action "base" | 241 hg: parse error: unknown action "base" |
| 242 | 242 |
| 243 $ hg tglog | 243 $ hg tglog |
| 244 @ 8:e8c55b19d366b335626e805484110d1d5f6f2ea3:draft 'J' | 244 @ 8:e8c55b19d366b335626e805484110d1d5f6f2ea3:draft 'J' |
| 245 | | 245 | |
| 246 o 7:b2f90fd8aa85db5569e3cfc30cd1d7739546368e:draft 'I' | 246 o 7:b2f90fd8aa85db5569e3cfc30cd1d7739546368e:draft 'I' |