Re: Help trying to merge my changes to current default

[Carnë Draug]

On 20 March 2018 at 14:39, Juan Pablo Carbajal <address@hidden> wrote:
> Hi all,
>
> I did some changes during Octconf to include test for pkg.m and start
> the refactoring of that function.
> Now, when I lok at hg log, I see I have done quite a messy commit
> work. Is there a way to export a clean change set (I guess some flavor
> of hg diff) to get only the things I have done to the sources?
>
> I essentially do not want to had to the repo history my commits
> ranting, quite rookie, to be honest. But I want to add the final form
> of the local branch I have.
>
> Is it maybe easier to just re-clone and copy the changes over and make
> a new commit with that?
>
> Thanks

I think you are looking for something like this

    hg rebase --collapse --base refactor_pkg --dest @