-
Notifications
You must be signed in to change notification settings - Fork 125
Align with fsharp/fsharp & Microsoft/VisualFSharp via cherry-picking #729
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
c2cdde0 to
4e31e31
Compare
|
@cloudRoutine Hmm.... We normally do this via integrating (merging) rather than cherry-picking. |
|
My mistake, the last time I had to move stuff across to them you told me to cherry-pick it, so I figured that was the way it was typically done. I can split off all of the conifguration and organization commits and then reapply them on top of a merge if you think that'd be better |
It's hard to tell. Normally I just merge and fixup conflicts. If it's equivalent to that then we can do that |
1df50da to
a17b456
Compare
|
maybe i'll try again some other day... |
|
@cloudRoutine I really, really want to get everything totally aligned and fully integrated. We would then start building FSharp.Compiler.Service in Microsoft/visualfsharp. It's possible we would still build the nuget package from here in case we need to make rapid fixes - but no feature development. The only feature drift I could imagine is Fable support, which requires a whole different test/tool chain to validate. Perhaps we could make a big push on this alignment this week. |
|
i'd gotten to the point where it was building successfully and only 10 tests were failing, but I wasn't especially confident in all of my changes. a suggestion on how we could make the alignment easier in the future - most places where type (* internal *) foo = ...to #if COMPILER
type internal foo
#else
type foo
#endif
(args ) =it should cut out a bit of merge conflict resolution busywork |
|
@cloudRoutine Yeah, we have to just align that stuff somehow, agreed |
restablish commits from fsharp/fsharp#726
integrate with Microsoft/visualfsharp @ 91da9db