Mercurial > hg
diff tests/test-rebase-scenario-global.out @ 9577:b91960aed018
rebase: improve error and debug messages
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Thu, 08 Oct 2009 10:07:41 +0200 |
parents | 7b19cda0fa10 |
children | 341182ac95e4 |
line wrap: on
line diff
--- a/tests/test-rebase-scenario-global.out Sun Oct 11 13:54:19 2009 -0500 +++ b/tests/test-rebase-scenario-global.out Thu Oct 08 10:07:41 2009 +0200 @@ -129,8 +129,8 @@ % These will fail % E onto D - rebase onto an ancestor -abort: cannot rebase a descendant +abort: source is descendant of destination % D onto E - rebase onto a descendant -abort: cannot rebase an ancestor +abort: source is ancestor of destination % E onto B - merge revision with both parents not in ancestors of target abort: cannot use revision 4 as base, result would have 3 parents