Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 33789:19f495fef0a3
rebase: change "result would have 3 parent" error message (BC)
The old error message "cannot use revision REV as base, result would have 3
parents" is confusing - why use REV as base? why add a new parent?.
This patch changes it to "cannot move parent", which seems better.
Differential Revision: https://phab.mercurial-scm.org/D342
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Sat, 12 Aug 2017 21:01:06 -0700 |
| parents | 0975506120fb |
| children | 30573b3d2ebc |
comparison
equal
deleted
inserted
replaced
| 33788:0531ffd59a98 | 33789:19f495fef0a3 |
|---|---|
| 492 rebasing 1:112478962961 "B" (B) | 492 rebasing 1:112478962961 "B" (B) |
| 493 rebasing 2:b18e25de2cf5 "D" (D) | 493 rebasing 2:b18e25de2cf5 "D" (D) |
| 494 not rebasing ignored 4:26805aba1e60 "C" (C) | 494 not rebasing ignored 4:26805aba1e60 "C" (C) |
| 495 not rebasing ignored 5:4b61ff5c62e2 "E" (E) | 495 not rebasing ignored 5:4b61ff5c62e2 "E" (E) |
| 496 rebasing 6:f15c3adaf214 "F" (F tip) | 496 rebasing 6:f15c3adaf214 "F" (F tip) |
| 497 abort: cannot use revision 6 as base, result would have 3 parents | 497 abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents |
| 498 [255] | 498 [255] |
| 499 | 499 |
| 500 $ cd .. | 500 $ cd .. |
| 501 | 501 |
| 502 test on rebase dropping a merge | 502 test on rebase dropping a merge |