Mercurial > hg
comparison tests/test-histedit-base.t @ 27712:bb810c8b3eca
histedit: report the unacceptable changeset
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 23 Dec 2015 07:37:45 +0000 |
| parents | e7ff83b2bcfe |
| children | b721c9543a4f |
comparison
equal
deleted
inserted
replaced
| 27711:7a678a12a5cf | 27712:bb810c8b3eca |
|---|---|
| 230 > base d273e35dcdf2 B | 230 > base d273e35dcdf2 B |
| 231 > pick e8c55b19d366 J | 231 > pick e8c55b19d366 J |
| 232 > base d273e35dcdf2 B | 232 > base d273e35dcdf2 B |
| 233 > pick b2f90fd8aa85 I | 233 > pick b2f90fd8aa85 I |
| 234 > EOF | 234 > EOF |
| 235 hg: parse error: may not use "base" with changesets within the edited list | 235 hg: parse error: base "643237336533" changeset was not an edited list candidate |
| 236 (only use listed changesets) | |
| 236 | 237 |
| 237 $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle | 238 $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle |
| 238 > base cd010b8cd998 A | 239 > base cd010b8cd998 A |
| 239 > pick d273e35dcdf2 B | 240 > pick d273e35dcdf2 B |
| 240 > pick 03772da75548 X | 241 > pick 03772da75548 X |