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

In message <[email protected]>,
Ralf Schlatterbeck writes:
>On Sat, Jan 19, 2019 at 01:11:07PM +0100, Mathias Behrle wrote:
>> If you don't want to have the history of the REST branch
>I want to keep the history. But see below.
>
>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.
>
>How do I do a rebase (preferrably an interactive rebase where I can
>edit individual commits) with hg?

Maybe https://bitbucket.org/edgimar/crecord? cdrecord is built into
3.5 mercurial and newer.

--
				-- rouilj
John Rouillard
===========================================================================
My employers don't acknowledge my existence much less my opinions.
On Sat, Jan 19, 2019 at 01:11:07PM +0100, Mathias Behrle wrote: