Skip to content

[Transforms] Merge master 09/01 #10679

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

Merged
merged 351 commits into from
Sep 6, 2016
Merged

[Transforms] Merge master 09/01 #10679

merged 351 commits into from
Sep 6, 2016

Conversation

yuit
Copy link
Contributor

@yuit yuit commented Sep 2, 2016

The last three comments are the ones that will need review

zhengbli and others added 30 commits August 10, 2016 12:34
Just cloning TS on travis takes 23 seconds on linux (68 seconds on mac), hopefully having it do a shallow clone will help.

We don't rely on any tagging/artifacts from the travis servers which clone depth could impact, so this shouldn't impact anything other than build speed.
…arameter-constraints

Correct this in tuple type parameter constraints
Use brand types to clear up confusion about entity name expressions
Optimize format of type list id strings used in maps
…pings": null` to disclude it from automatically included typings.
Fix discriminated unions with primtive types
@yuit yuit added the Domain: Transforms Relates to the public transform API label Sep 2, 2016
@kpreisser
Copy link
Contributor

Hi @yuit, @rbuckton,
sorry to ask again, but can you give me information about the merging operation (squash commit vs. merge commit), as I commented in #10263?
In particular, I'm wondering why the pull request (Merge master 08/09) has been merged as a squash commit (single commit with all the changes) rather than a merge commit (which has two parent commits).

For example, commit 3f6aa3f seems to have been merged with the previous PR already (in the squash commit), but is included in this PR again, as AFAIK for Git it looks as if the last merged commit from the master branch to the transforms branch was 4a470bd (the red graph represents the master branch, the black one the mergeMaster_09/01 branch):
ts-transforms-branches

Thank you!

Andy added 5 commits September 2, 2016 13:17
Factor public type definitions out of services.ts into services/types.ts
Use explicit pairs `verify.goToDefinition([["a", "b"], ["c", "d"]])` instead of `verify.goToDefinition("a", "b", "c", "d")`.
Also provide an option `verify.goToDefinition({ a: "b", c: "d" })` for cases where the starts are not theirselves lists.
Search for `node_modules` in parent directories when getting type roots.
@rbuckton
Copy link
Contributor

rbuckton commented Sep 4, 2016

👍

@yuit
Copy link
Contributor Author

yuit commented Sep 6, 2016

@kpreisser Thanks for raising this up! I didn't saw your original comment until now and wasn't awared of the different. Now that I know I will not squash my commit. I normally do so when I merge to master but you are absolutely right that this should be done with merge commit which I will do so here. Thank you so much for sharing this

@yuit yuit merged commit 7daf2e3 into transforms Sep 6, 2016
@yuit yuit deleted the mergeMaster_09/01 branch September 6, 2016 18:37
@kpreisser
Copy link
Contributor

Great, thanks!

@microsoft microsoft locked and limited conversation to collaborators Jun 19, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Domain: Transforms Relates to the public transform API
Projects
None yet
Development

Successfully merging this pull request may close these issues.