[flang-dev] Rewriting f18's history for inclusion in llvm monorepo

[Mehdi AMINI via flang-dev]

Having done it for MLIR integration in the monorepo, if you're already
rewriting the history you can also immediately move everything in a "flang"
subdirectory.
It provides better `git log` for files compared to a subtree merge.

I am using the git-filter-repo tool and invoke it with:

git-filter-repo --path-rename :mlir/ --force --refs master

-- 
Mehdi



On Thu, Dec 5, 2019 at 2:27 PM Peter Waller via flang-dev <
flang-dev at lists.llvm.org> wrote:

> Hi List,
>
> Following on from previous conversations about integrating f18 with the
> llvm monorepo, we wanted to preserve as much history as we can, but also
> to have a history without merge commits.
>
> I've just submitted a pull request containing a "flatten.sh" which tries
> to do this. Further information is in the pull request. To help with
> review I've pushed the rewritten history up as well.
>
> Pull request: https://github.com/flang-compiler/f18/pull/854
> Example rewritten history: https://github.com/peterwaller-arm/f18/tree/new
>
> It's not perfect yet, in particular for merge commits:
>
> * The commit messages aren't great (yet).
> * We could talk about exactly what metadata we want to preserve for merges.
>
> For now I've assumed that the second-parent of the merge commit contains
> the relevant authorship information for the patch, so the GIT_AUTHOR_*
> is taken from this, which is the last commit before a pull request is
> merged.
>
> Once we're happy with this in flang-dev, we can present this to llvm-dev
> and adapt the script for submission.
>
> Your input is welcomed.
>
> Regards,
>
> - Peter
>
> _______________________________________________
> flang-dev mailing list
> flang-dev at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/flang-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/flang-dev/attachments/20191206/70080cba/attachment.html>