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

On Sat, 19 Jan 2019, Mathias Behrle wrote:

> If you don't want to have the history of the REST branch (but rather an
> overview of the complete changes and collapse the multiple changesets into one)
> you also could extract the pure changes made by Chau Nguyen by making a diff
> between 
> https://bitbucket.org/kinggreedy1991/roundup-bpo/commits/d10821d84c4cc0c0e60bf6e38b170eed1b9a990f
> and
> https://bitbucket.org/kinggreedy1991/roundup-bpo/commits/7f2ad229b72595ff48e821755c50d6f1acacd833
> and re-apply the diff on tip.

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.

-- 
Joseph S. Myers
[email protected]