Re: REST-API: Merging/Rebasing with Mercurial?

On Sat, 19 Jan 2019, Ralf Schlatterbeck wrote:

> On Sat, Jan 19, 2019 at 01:31:32PM +0000, Joseph Myers wrote:
> > 
> > Note that at some point the REST changes appear to have converted 
> > roundup/cgi/client.py to CRLF line endings (at least, it has such line 
> > endings on that branch, though I haven't identified the relevant commit 
> > introducing them).  Certainly that line ending change should not be merged 
> > into trunk, and I think it would also be unhelpful to have conversions to 
> > and from such line endings present in the history of trunk.
> 
> That also cries for an interactive rebase with editing of all changes
> that introduced newline problems but otherwise keeps the changes as
> done by the original committer.

On further investigation, the CRLF line endings appear to come from:

changeset:   4957:2df045caaa2f
branch:      bugs.python.org
parent:      4926:2a6874eea8c5
parent:      4956:e56047711df2
user:        Ezio Melotti <[email protected]>
date:        Thu Apr 03 02:00:39 2014 +0300
summary:     Merge with default.

(a consequence of the REST branch being based on the bugs.python.org 
branch).

-- 
Joseph S. Myers
[email protected]