[PATCH] histedit: pick an appropriate base changeset by default (BC)
Augie Fackler
raf at durin42.com
Wed Nov 25 15:04:20 CST 2015
> On Nov 25, 2015, at 1:10 PM, Martin von Zweigbergk <martinvonz at google.com> wrote:
>
>
>
> 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).
Yep. I like where this is headed, and now just want marmoute to chime in since he’s been working on other default destination business lately.
AF
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20151125/0c908ecf/attachment.pgp>
More information about the Mercurial-devel
mailing list