Re: git newbie errors

[Katsumi Yamaoka <yamaoka@jpl.org>]

Lars Magne Ingebrigtsen wrote:
> I did...  something...  just now that probably removed Sven, Glenn, and
> Katsumi's last three patches.  I'm not quite sure what.

> But I've tried reapplying them, but have a look...

Er, I don't know what happened in your side.  I did:

When I was about to apply Sven's patch, I found nnbabyl.el has
been changed by Glenn in the Emacs trunk.  So, I put Glenn's
change and Sven's patch into the local copy of Gnus git, and
updated the ChangeLog locally.  And then:

git commit --author='Glenn...' -m '...' lisp/nnbabyl.el
git push
git commit --author='Sven...' -m '...' lisp/message.el
git push
git commit -m Update. lisp/ChangeLog
git push

(Maybe a better way was to push Glenn's change and its log, and
then to put Sven's change and its log.)

Before them I noticed "(was Re: ...)" in subject was not removed
even though message-subject-trailing-was-query is t (to which Lars
has changed it in 2010-10-31).  Try replying to the article:

<b4msjzc1jwt.fsf_-_@jpl.org>

Therefore I changed message-subject-trailing-was-regexp slightly.
See: <E1PFdVw-0007jE-00@quimby.gnus.org>

Now "(was Re: ...)" got not being deleted again. :<

BTW, I wondered why there are two regexps
message-subject-trailing-was-ask-regexp and
message-subject-trailing-was-regexp.  Is there any reason unable
to integrate them into one?