Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Mon Aug 14 07:02:38 2017 -0700 +++ b/tests/test-rebase-obsolete.t Sat Aug 12 21:01:06 2017 -0700 @@ -494,7 +494,7 @@ not rebasing ignored 4:26805aba1e60 "C" (C) not rebasing ignored 5:4b61ff5c62e2 "E" (E) rebasing 6:f15c3adaf214 "F" (F tip) - abort: cannot use revision 6 as base, result would have 3 parents + abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents [255] $ cd ..