Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Lars Ingebrigtsen]

Eli Zaretskii <eliz@gnu.org> writes:

>     * lisp/url/url.el (url-retrieve-synchronously): Doc fix.  (Bug#23411)

Hm, I did this on the trunk a few days ago.  Perhaps I should backport
all the doc fixes from the last few days?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Lars Ingebrigtsen]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Eli Zaretskii <eliz@gnu.org> writes:
>
>>     * lisp/url/url.el (url-retrieve-synchronously): Doc fix.  (Bug#23411)
>
> Hm, I did this on the trunk a few days ago.  Perhaps I should backport
> all the doc fixes from the last few days?

Or if someone else would go through them and see which ones are
relevant, that would be even better.  :-)

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Cc: Eli Zaretskii <eliz@gnu.org>
> Date: Sun, 01 May 2016 17:40:42 +0200
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> >     * lisp/url/url.el (url-retrieve-synchronously): Doc fix.  (Bug#23411)
> 
> Hm, I did this on the trunk a few days ago.  Perhaps I should backport
> all the doc fixes from the last few days?

Yes, of course.  Doc fixes are always safe.

Thanks.

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Lars Ingebrigtsen]

Eli Zaretskii <eliz@gnu.org> writes:

> Yes, of course.  Doc fixes are always safe.

Ok; I'll start cherry-picking...

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Lars Ingebrigtsen]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Eli Zaretskii <eliz@gnu.org> writes:
>
>> Yes, of course.  Doc fixes are always safe.
>
> Ok; I'll start cherry-picking...

Should I do them all in one long "git cherry-pick -xe <long line of
commit ids>" or separately?  If the latter, is there an easy way to add
the string "backport:" to every commit without doing it manually?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[David Engster]

Lars Ingebrigtsen writes:
> If the latter, is there an easy way to add the string "backport:" to
> every commit without doing it manually?

FWIW, gitmerge.el should be able to detect cherry-picks through git's
"cherry mark", so putting in an additional string to the commit message
shouldn't be necessary. You only need to do that if you somehow modified
the patch during cherry-picking (by resolving a conflict, for instance).

-David

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Lars Ingebrigtsen]

David Engster <deng@randomsample.de> writes:

> Lars Ingebrigtsen writes:
>> If the latter, is there an easy way to add the string "backport:" to
>> every commit without doing it manually?
>
> FWIW, gitmerge.el should be able to detect cherry-picks through git's
> "cherry mark", so putting in an additional string to the commit message
> shouldn't be necessary. You only need to do that if you somehow modified
> the patch during cherry-picking (by resolving a conflict, for instance).

Oh, great.  Then I can just do a cherry-pick -x, then, on the list of
doc fixes that apply without any conflicts.  That seems to be...
uhm...  65-ish...

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[David Engster]

Lars Ingebrigtsen writes:
> David Engster <deng@randomsample.de> writes:
>
>> Lars Ingebrigtsen writes:
>>> If the latter, is there an easy way to add the string "backport:" to
>>> every commit without doing it manually?
>>
>> FWIW, gitmerge.el should be able to detect cherry-picks through git's
>> "cherry mark", so putting in an additional string to the commit message
>> shouldn't be necessary. You only need to do that if you somehow modified
>> the patch during cherry-picking (by resolving a conflict, for instance).
>
> Oh, great.  Then I can just do a cherry-pick -x, then, on the list of
> doc fixes that apply without any conflicts.  That seems to be...
> uhm...  65-ish...

Even if you have a conflict, the '-x' will already append "cherry picked
from commit...", which we should probably just add to
gitmerge-skip-regexp anyway.

-David

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Lars Ingebrigtsen]

David Engster <deng@randomsample.de> writes:

> Even if you have a conflict, the '-x' will already append "cherry picked
> from commit...", which we should probably just add to
> gitmerge-skip-regexp anyway.

Ok; I've now done the cherry-pick on all 65 doc fixes, and the result is
without conflicts, and emacs-25 still builds.  :-)

I just wanted to triple-check before pushing: Is this the way to do it?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Cc: Eli Zaretskii <eliz@gnu.org>,  emacs-devel@gnu.org
> Date: Sun, 01 May 2016 19:47:03 +0200
> 
> David Engster <deng@randomsample.de> writes:
> 
> > Even if you have a conflict, the '-x' will already append "cherry picked
> > from commit...", which we should probably just add to
> > gitmerge-skip-regexp anyway.
> 
> Ok; I've now done the cherry-pick on all 65 doc fixes, and the result is
> without conflicts, and emacs-25 still builds.  :-)

Thanks.

> I just wanted to triple-check before pushing: Is this the way to do it?

What is "this" that you are asking about?

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Lars Ingebrigtsen]

Eli Zaretskii <eliz@gnu.org> writes:

>> Ok; I've now done the cherry-pick on all 65 doc fixes, and the result is
>> without conflicts, and emacs-25 still builds.  :-)
>
> Thanks.
>
>> I just wanted to triple-check before pushing: Is this the way to do it?
>
> What is "this" that you are asking about?

Uhm...  cherry-picking and pushing?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Cc: deng@randomsample.de,  emacs-devel@gnu.org
> Date: Sun, 01 May 2016 20:04:54 +0200
> 
> >> I just wanted to triple-check before pushing: Is this the way to do it?
> >
> > What is "this" that you are asking about?
> 
> Uhm...  cherry-picking and pushing?

Yes.

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[Lars Ingebrigtsen]

Eli Zaretskii <eliz@gnu.org> writes:

> Yes.

Ok; here goes...

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411)

[David Engster]

Lars Ingebrigtsen writes:
> Eli Zaretskii <eliz@gnu.org> writes:
>
>> Yes.
>
> Ok; here goes...

Looks good. git detects all the picks except one (4a2f33d1a11). I forgot
that git of course does resolve things automatically when possible, so
I've now added "cherry picked from commit" to gitmerge-skip-regexp.

-David