Update `next` to be current with `master` #13913

pelotom · 2018-12-15T02:22:59Z

No description provided.

* Timeout props We could just use the component's timeout props. Tried it myself and it worked :) * [Grow] Condense the demo

Closes mui#13662

* [docs] Fix theme menu link * better hash url generator

* [Tooltip] Fix the property forwarding priority * review

* Change &quote; to ' * fix all the occurrences

* [Input, InputBase] fix propTypes of value and defaultValue * add a test

* [Dialog] Add xl maxWidth and demo component * let's merge

…ui#13686) * [docs] Add support for changing react version in codesandbox demos [docs] Change styles Hook API codesandbox to use next version of react and react-dom * [docs] Change react version for Adapting hook API codesandbox demo * add the next flag to all the demos in case of

* ignore touchmove after touchend * only listen to touchmove if touch enabled * test add fireBodyMouseEvent helper

* [docs] Add notistack Snackbar live deme in complementary projects * Fix peer dependecy issue with @material-ui/core * let's merge * add a comment about what next-plugin-transpile-modules is doing

) * [Tooltip] Hide native title when disableHoverListener is true * add a comment

Closes mui#13718 * [styles] Add options definitions for makeStyles * [styles] Improve makeStyles typings test coverage

* Add icon to InputBaseClassKey types * [InputBase] Remove dead disableUnderline property

* [InputBase] Remove props capturing of disableUnderline * [FilledInput] Add conditional logic to remove underline in filled input * Update FilledInput.js * Update FilledInput.js * let's merge

pelotom · 2018-12-15T17:03:22Z

I see. So I’ll just merge and push from the cli.

eps1lon · 2018-12-20T07:24:55Z

So this is now a single commit in next. What happens when we release v4 and merge next into master?

oliviertassinari · 2018-12-20T07:36:26Z

@eps1lon Last time I have checked, @pelotom merged the pull-request then push forced on next so we keep all our contribution history.

pelotom · 2018-12-20T07:48:08Z

@eps1lon Last time I have checked, @pelotom merged the pull-request then push forced on next so we keep all our contribution history.

I just fast-forward merged from master on the command line and pushed, no force needed 🙂

eps1lon · 2018-12-20T08:24:45Z

$ git checkout next
$ git pull upstream/next
$ git merge --ff-only upstream/master
fatal: Not possible to fast-forward, aborting.

What am I missing here?

pelotom · 2018-12-20T16:15:14Z

Looks like 2 days ago #13923 was merged targeting next, was that supposed to target master?

oliviertassinari · 2018-12-20T18:19:55Z

No, it wasn't!

pelotom · 2018-12-20T18:22:55Z

Ok, so next has diverged, but not due to a squashed merge from master, so it's all good right?

oliviertassinari · 2018-12-20T18:45:25Z

I'm cherry-picking the commit on master. I still think that we can push force for this time.

pelotom · 2018-12-20T18:48:17Z

@oliviertassinari I'm confused, you said #13923 wasn't supposed to target master, did you mean the opposite?

oliviertassinari · 2018-12-20T18:49:55Z

@pelotom The pull request was supposed to target master. Well spotted.

eps1lon · 2019-01-11T11:05:21Z

@oliviertassinari Where was the change included in master? Looks like the commit is still only on next. A cherry-pick would've been the easiest solution that would've reconciled the two branches too.

eps1lon · 2019-01-11T11:21:49Z

Original squashed commit that was merged into next: 6759f7c
Commit in master: 91a95d3

Looks like you picked the commit from the PR branch not the squashed commit. The commit on master is missing the PR link so I would still include both commits. It's duplication but I'd prefer the PR link over no duplication.

oliviertassinari · 2019-01-11T11:52:29Z

@eps1lon next and master should be in sync. I think that we should do:

git checkout master
git fetch --all --prune
git checkout next
git reset --h master
git push --force

eps1lon · 2019-01-11T12:00:24Z

@eps1lon next and master should be in sync.

You state this like it's obvious what this means. They currently have one different commit each that results in the same diff but a different commit message.

You are now proposing to remove the commit from next and therefore the link to the PR. Since you explained this in detail and not just simply said no to my proposal I just want to confirm that we're on the same page.

oliviertassinari · 2019-01-11T13:31:26Z

The above command lines were a suggestion, the simplest option I can think of. My point is that we haven't yet merged any pull request intentionnaly on the next branch. So the next branch should be an anchestor of the master branch. It's not the case as we are speaking. Regarding the pull request that was merged on the wrong branch. I have cherrypick it on master at some point.

eps1lon · 2019-01-11T13:49:54Z

Ok so we're not on the same page. Again I direct you to #13913 (comment) where I proofed that the commit you cherry-picked is not the one from next which caused next and master to diverge. This is the current state:

Now you still didn't explicitly addressed my proposal. In order to "sync" next and master I proposed that we include the duplicate commit from master into next because the commit in next has more information than the commit in master. It results in some duplication but also additional information.

Your suggestion would result in a loss of information. The commit that included the PR link in the commit message would disappear. The patch is still there because you cherry-picked a different commit but the commit message would be different. Could you acknowledge that because I want to be very clear if we remove information from our commit history.

oliviertassinari · 2019-01-11T14:04:45Z

I proofed that the commit you cherry-picked is not the one from next which caused next and master to diverge. This is the current state:

Yes, it's not the same one. My mistake.

eps1lon · 2019-01-11T14:08:23Z

Yes, it's not the same one. My mistake.

It was definitely not my intention to get you to admit a mistake. Obviously git is very hard and I don't seem to know how to do it properly either. Just want to make sure that we do recognize that we will loose the link to the PR and we're willing to make that tradeoff to have a cleaner commit history.

Otherwise we can simply rebase master into next instead of resetting next to master.

oliviertassinari · 2019-01-11T14:11:56Z

@eps1lon As you see fit, I have tried the merge from master into next. It looks fine too.

oliviertassinari · 2019-01-11T14:13:54Z

I have tried merging next into master. It looks even better.

oliviertassinari · 2019-01-11T14:14:15Z

We can merge next into master. Then reset hard next on master.

Followup on mui#13913

oliviertassinari and others added 30 commits November 21, 2018 19:51

[docs] Better IE 11 support

52e8204

Related to mui#13639.

[Grow] Condense the demo (mui#13665)

086a6a5

* Timeout props We could just use the component's timeout props. Tried it myself and it worked :) * [Grow] Condense the demo

[docs] Improve Grid limitation description (mui#13668)

c264576

Closes mui#13662

[docs] Fix theme menu link (mui#13669)

8da4cb8

* [docs] Fix theme menu link * better hash url generator

[Tooltip] Fix the property forwarding priority (mui#13667)

c7a1dcd

* [Tooltip] Fix the property forwarding priority * review

[Modal] Fix the close jump on Windows (mui#13674)

61d858e

[docs] Notification, black friday

46cb140

[docs] Change &quote; to ' (mui#13678)

021f8a7

* Change &quote; to ' * fix all the occurrences

[Select] Support object value (mui#13661)

b9d757c

* [Input, InputBase] fix propTypes of value and defaultValue * add a test

[Menu] Fix wrong condition (mui#13675)

bc89a3b

[docs] Restructure the demo based on usage analytics (mui#13684)

ce64258

[docs] Fix typo in URL (mui#13688)

712d0c2

[docs] Notification Cyber Monday

11330cf

[CHANGELOG] Prepare v3.6.0

8d70988

[CHANGELOG] Prepare v3.6.0

12f3252

v3.6.0

d9c790f

[Dialog] Add xl maxWidth and demo component (mui#13694)

072959c

* [Dialog] Add xl maxWidth and demo component * let's merge

[Dialog] Add missing TypeScript style rule

ddfa8e0

[ClickAwayListener] Ignore touchend after touchmove (mui#13689)

b162be4

* ignore touchmove after touchend * only listen to touchmove if touch enabled * test add fireBodyMouseEvent helper

[CHANGELOG] Add deprecation notice for Divider (mui#13700)

bb4c24d

[docs] Add notistack demo to the snackbar page (mui#13685)

8f31edc

* [docs] Add notistack Snackbar live deme in complementary projects * Fix peer dependecy issue with @material-ui/core * let's merge * add a comment about what next-plugin-transpile-modules is doing

[Tooltip] Hide native title when disableHoverListener is true (mui#13690

0b77044

) * [Tooltip] Hide native title when disableHoverListener is true * add a comment

[withTheme] Fix typography warning (mui#13707)

8fe2bfd

[test] Correct the link to the example test (mui#13709)

28df118

[Fab] Add Fab type declaration to index and theme (mui#13715)

1c8c887

[styles] Add options definitions for makeStyles (mui#13721)

ac0153b

Closes mui#13718 * [styles] Add options definitions for makeStyles * [styles] Improve makeStyles typings test coverage

[InputBase] Remove dead disableUnderline property (mui#13720)

2ce70f0

* Add icon to InputBaseClassKey types * [InputBase] Remove dead disableUnderline property

[FilledInput] Fix disableUnderline property (mui#13719)

53e44d5

* [InputBase] Remove props capturing of disableUnderline * [FilledInput] Add conditional logic to remove underline in filled input * Update FilledInput.js * Update FilledInput.js * let's merge

[docs] Remove Grid List dead code (mui#13731)

1ac783f

pelotom merged commit 7c074a7 into mui:next Dec 15, 2018

pelotom deleted the update-next branch December 15, 2018 17:16

eps1lon added a commit to eps1lon/material-ui that referenced this pull request Jan 11, 2019

Merge remote-tracking branch 'upstream/next'

3766577

Followup on mui#13913

This was referenced Sep 15, 2021

[Snyk] Fix for 1 vulnerabilities nbv1982/material-ui#62

Open

[Snyk] Fix for 1 vulnerabilities hzhz/material-ui#53

Open

[Snyk] Fix for 1 vulnerabilities maniator/material-ui#24

Open

snyk-bot mentioned this pull request Dec 24, 2021

[Snyk-local] Fix for 8 vulnerabilities Nealm03/material-ui#9

Open

zannager added the docs Improvements or additions to the documentation label Mar 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update `next` to be current with `master` #13913

Update `next` to be current with `master` #13913

pelotom commented Dec 15, 2018

pelotom commented Dec 15, 2018

eps1lon commented Dec 20, 2018

oliviertassinari commented Dec 20, 2018

pelotom commented Dec 20, 2018 •

edited

Loading

eps1lon commented Dec 20, 2018

pelotom commented Dec 20, 2018

oliviertassinari commented Dec 20, 2018

pelotom commented Dec 20, 2018

oliviertassinari commented Dec 20, 2018 •

edited

Loading

pelotom commented Dec 20, 2018

oliviertassinari commented Dec 20, 2018 •

edited

Loading

eps1lon commented Jan 11, 2019

eps1lon commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019

eps1lon commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019 •

edited

Loading

eps1lon commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019

eps1lon commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019

Update next to be current with master #13913

Update next to be current with master #13913

Conversation

pelotom commented Dec 15, 2018

pelotom commented Dec 15, 2018

eps1lon commented Dec 20, 2018

oliviertassinari commented Dec 20, 2018

pelotom commented Dec 20, 2018 • edited Loading

eps1lon commented Dec 20, 2018

pelotom commented Dec 20, 2018

oliviertassinari commented Dec 20, 2018

pelotom commented Dec 20, 2018

oliviertassinari commented Dec 20, 2018 • edited Loading

pelotom commented Dec 20, 2018

oliviertassinari commented Dec 20, 2018 • edited Loading

eps1lon commented Jan 11, 2019

eps1lon commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019

eps1lon commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019 • edited Loading

eps1lon commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019

eps1lon commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019

oliviertassinari commented Jan 11, 2019

Update `next` to be current with `master` #13913

Update `next` to be current with `master` #13913

pelotom commented Dec 20, 2018 •

edited

Loading

oliviertassinari commented Dec 20, 2018 •

edited

Loading

oliviertassinari commented Dec 20, 2018 •

edited

Loading

oliviertassinari commented Jan 11, 2019 •

edited

Loading