[PATCH remotenames] pull: fix pull --rebase with a --tool argument

[Sean Farley]

Adam Simpkins <simpkins at fb.com> writes:

> # HG changeset patch
> # User Adam Simpkins <simpkins at fb.com>
> # Date 1496173480 25200
> #      Tue May 30 12:44:40 2017 -0700
> # Node ID 3988f1c49f0d86d6e0c8a7bbfaf738d70fddf916
> # Parent  78c8966c02759755235a6566e0c557b82ff9cb0a
> pull: fix pull --rebase with a --tool argument
>
> The code previously stripped off the --rebase argument when invoking the
> original pull() command code, but did not strip off --tool, causing the command
> to incorrectly fail.
>
> This fixes the code to also strip off --tool when invoking pull, and then pass
> this argument in when doing the rebase.

Ah, good catch; queued!

> However, the way the rebase code invokes merge does seem to result in rather
> confusing behavior: the "internal:other" tool preserves the local changes,
> while "internal:local" preserves the changes pulled from the remote.

Isn't this the case with all rebases (it switches the sides)?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 800 bytes
Desc: not available
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20170530/483ab4bc/attachment.sig>