[PATCH 1 of 2] rebase: add --detach to force detaching from the original branch (issue1950)

Matt Mackall mpm at selenic.com
Thu Dec 31 14:37:23 CST 2009


On Thu, 2009-12-31 at 02:50 +0100, Stefano Tortarolo wrote:
> +                if collapsef:
> +                    raise error.ParseError(
> +                        'rebase', _('cannot use collapse with detach'))

Why not?

> +                if basef:
> +                    raise error.ParseError(
> +                        'rebase', _('cannot specify a base with detach'))
> +
>              cmdutil.bail_if_changed(repo)
> -            result = buildstate(repo, destf, srcf, basef, collapsef)
> +            result = buildstate(repo, destf, srcf, basef, collapsef, detachf)
>              if result:
> -                originalwd, target, state, external = result
> +                originalwd, target, state, detach, external = result

If some crazy person decides to update hg while in the middle of a
rebase, what happens?

-- 
http://selenic.com : development and support for Mercurial and Linux




More information about the Mercurial-devel mailing list