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

[Richard Barton via flang-dev]

Hi Peter

I think this is fantastic progress - thanks so much for your hard work here.

To everyone else: with Peter's script we can get ourselves a straightline history of F18 with a meagre 6 squash commits in it. 
I think that if we can fix the issue with locating the original commit so we can put this in the commit message of the new commit then we can still manually piece together a good git history for these 6 commits.

I propose this is good enough to present to the LLVM community as our patch set to put on top of the monorepo - anyone disagree with that?

Ta
Rich

> -----Original Message-----
> From: flang-dev <flang-dev-bounces at lists.llvm.org> On Behalf Of Peter
> Waller via flang-dev
> Sent: 6 December, 2019 16:04
> To: flang-dev at lists.llvm.org
> Subject: Re: [flang-dev] Rewriting f18's history for inclusion in llvm monorepo
> 
> On 06/12/2019 15:49, Peter Waller via flang-dev wrote:
> > The other obvious solution might be to detect this case and throw it
> > into the "hard" bucket.
> 
> I just had a quick go at this by detecting merges into branches and it
> results in 199 squashed merge commits, which consolidate a total of 603
> commits.
> 
> I'm now going to stop working on this until there is more public
> feedback about precisely what needs to be achieved.
> 
> Generally, I'm beginning to think trying to preserve the individual
> commits in branches is fraught, especially when there is merge activity
> going into those branches. It really needs someone to go and rebase all
> those branches and check that the result is correct, and I think there
> may be many cases where it is not.
> 
> When linearizing the history in this way, the only points with a simple
> set of guarantees about are the first-parent commits on the mainline branch.
> 
> Perhaps there is a better approach I've not considered, but I'm thinking
> it would require someone who is more adept at patch algebra than me :)
> 
> Have a good weekend,
> 
> - Peter
> 
> _______________________________________________
> flang-dev mailing list
> flang-dev at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/flang-dev