Skip to content

fix(@angular-devkit/schematics): Fix merge that causes an overwrite#19878

Merged
alan-agius4 merged 1 commit into
angular:masterfrom
Brocco:schematic-overwrite-fix
Jan 28, 2021
Merged

fix(@angular-devkit/schematics): Fix merge that causes an overwrite#19878
alan-agius4 merged 1 commit into
angular:masterfrom
Brocco:schematic-overwrite-fix

Conversation

@Brocco
Copy link
Copy Markdown
Contributor

@Brocco Brocco commented Jan 26, 2021

This fixes #11337 to allow for merging of a tree with another when the the file already exists in the tree being merged into.

@google-cla google-cla Bot added the cla: yes label Jan 26, 2021
Brocco
Brocco commented Jan 26, 2021
View reviewed changes
Comment thread packages/angular_devkit/schematics/src/tree/host-tree.ts Outdated
alan-agius4
alan-agius4 reviewed Jan 26, 2021
View reviewed changes
Comment thread packages/angular_devkit/schematics/src/tree/host-tree_spec.ts Outdated
@Brocco Brocco force-pushed the schematic-overwrite-fix branch 2 times, most recently from 694e312 to b10d482 Compare January 26, 2021 20:44
clydin
clydin requested changes Jan 26, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@clydin clydin left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like at least one E2E test is failing as well.
node ./tests/legacy-cli/run_e2e.js ./tests/legacy-cli/e2e/tests/generate/component/component-duplicate.ts

Comment thread packages/angular_devkit/schematics/src/tree/host-tree_spec.ts Outdated
Comment thread packages/angular_devkit/schematics/src/tree/host-tree_spec.ts
@Brocco Brocco force-pushed the schematic-overwrite-fix branch 3 times, most recently from 0f39a57 to df6dd97 Compare January 26, 2021 23:07
clydin
clydin reviewed Jan 27, 2021
View reviewed changes
Comment thread packages/angular_devkit/schematics/src/tree/host-tree.ts Outdated
@Brocco Brocco force-pushed the schematic-overwrite-fix branch 2 times, most recently from 8bf63b6 to 21f15fc Compare January 27, 2021 15:47
@clydin clydin added the target: patch This PR is targeted for the next patch release label Jan 27, 2021
clydin
clydin reviewed Jan 27, 2021
View reviewed changes
Comment thread tests/legacy-cli/e2e/tests/generate/component/component-duplicate.ts Outdated
@Brocco
fix(@angular-devkit/schematics): Fix merge that causes an overwrite
39e584f 
This fixes angular#11337 to allow for merging of a tree with another when the the file already exists in the tree being merged into.
@Brocco Brocco force-pushed the schematic-overwrite-fix branch from 21f15fc to 39e584f Compare January 27, 2021 15:56
@clydin clydin added the action: merge The PR is ready for merge by the caretaker label Jan 27, 2021
@alan-agius4 alan-agius4 merged commit a179828 into angular:master Jan 28, 2021
@Brocco Brocco deleted the schematic-overwrite-fix branch January 28, 2021 16:44
@angular-automatic-lock-bot
Copy link
Copy Markdown

angular-automatic-lock-bot Bot commented Feb 28, 2021

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot Bot locked and limited conversation to collaborators Feb 28, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@alan-agius4 alan-agius4 alan-agius4 left review comments

@clydin clydin clydin approved these changes

Assignees

No one assigned

Labels

action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

MergeStrategy seems to be completely broken (mergeWith failure)

3 participants

@Brocco @alan-agius4 @clydin