comparison 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
comparison
equal deleted inserted replaced
9576:c156bf947e26 9577:b91960aed018
127 |/ 127 |/
128 o 0: A 128 o 0: A
129 129
130 % These will fail 130 % These will fail
131 % E onto D - rebase onto an ancestor 131 % E onto D - rebase onto an ancestor
132 abort: cannot rebase a descendant 132 abort: source is descendant of destination
133 % D onto E - rebase onto a descendant 133 % D onto E - rebase onto a descendant
134 abort: cannot rebase an ancestor 134 abort: source is ancestor of destination
135 % E onto B - merge revision with both parents not in ancestors of target 135 % E onto B - merge revision with both parents not in ancestors of target
136 abort: cannot use revision 4 as base, result would have 3 parents 136 abort: cannot use revision 4 as base, result would have 3 parents