[PATCH] histedit: pick an appropriate base changeset by default (BC)

Martin von Zweigbergk martinvonz at google.com
Wed Nov 25 12:10:13 CST 2015


On Wed, Nov 25, 2015 at 10:00 AM Gregory Szorc <gregory.szorc at gmail.com>
wrote:

> On Wed, Nov 25, 2015 at 7:12 AM, Martin von Zweigbergk <
> martinvonz at google.com> wrote:
>
>> In git, you can configure an "upstream" for your branch. That is used as
>> a default for histedit (rebase -i), rebase and merge. I think it makes
>> sense for them to default to the same thing. I know there has been
>> resistance to adding an upstream concept, but I think it's worth
>> considering at least some way of having these commands default to the same
>> thing.
>>
>
> If we ever add remotes more officially, I think we could factor out this
> code to take them into effect. The first iteration of this patch added a
> convenience function to destutils.py to look up the default base revision.
> I decided to inline it for the time being. We could always extract it to
> destutils.py so a remotes extension could monkeypatch it.
>

Sounds promising. I haven't been following the discussion about remotes. As
long as it will be okay to later change the default when there's a
configured remote.

Thanks for working on this, btw. I agree with having *some* default (I
think I actually made 'git rebase' default to upstream once upon a time).
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20151125/eeb8de89/attachment.html>


More information about the Mercurial-devel mailing list