[PATCH 1 of 2] rebase: improve error and debug messages

timeless timeless at gmail.com
Tue Oct 13 03:18:43 CDT 2009


On Thu, Oct 8, 2009 at 12:06 PM, Sune Foldager <cryo at cyanite.org> wrote:
> -            raise util.Abort(_('cannot rebase an ancestor'))
> +            raise util.Abort(_('source is ancestor of destination'))

i'm not a fan of 'source' or 'ancestor'

"new parent changeset is derived from the changeset you're trying to move"

>         if commonbase == repo[dest]:
> -            raise util.Abort(_('cannot rebase a descendant'))
> +            raise util.Abort(_('source is descendant of destination'))

I don't get this.

Would it be unreasonable for me to ask for inline comments showing
pictures of the scenarios that rebase doesn't like for these cases?

# o 1: initial commit
# |
# * 2: commit to rebase
# |
# o 3: new parent for rebase
#
# We can't safely move 2 below 3, so we issue the following error:
raise util.Abort(...)

Then I'd have some way of understanding the errors.



More information about the Mercurial-devel mailing list