Tags: patch

J.P. wrote:

> Looks like you've combined ("fixed up") your patch with the
> provided test and data files. That's fine, but its changes
> should be listed in the commit message as well:
>
>   * test/lisp/erc/erc-scenarios-misc-commands.el
>   (erc-scenarios-misc-commands--AMSG-GMSG-AME-GME): New test.
>   * test/lisp/erc/resources/commands/amsg-barnet.eld: New file.
>   * test/lisp/erc/resources/commands/amsg-foonet.eld: New file.
>
> In the future, maybe look into "squashing" to preserve
> messages. Also, consider adding an entry to etc/ERC-NEWS if
> you think people can benefit from these commands.

You are right, I did the rebase with squash instead of fixup
and got the previous messages. The missing four lines above
I inserted manually.

I am unsure what order you should to the pull and the rebase
commands? Maybe I did them the other way around last time.
If you pull, it says there is no tracking data. When you
rebase onto it says it is fine. But pulling again after that
doesn't do anything. So maybe the initial pull actually did
the pull, just saying tracking must be set as well?

$ git log --graph --oneline --decorate -a
$ git rebase -i HEAD~2
$ git commit --amend
$ git pull
$ git rebase --onto origin/master 'ib^' ib
$ git format-patch master -M -o .ib

Anyway here is the patch. If it is OK, I'll do it again to do
the change to etc/ERC-NEWS since I forgot about that this
time around (but I'm happy to do it again, since now I think
the commands start to make a little more sense to me at least
on a superficial level :P)