Skip to content

Allow Restore to discard pending changes#6330

Merged
scbedd merged 6 commits intoAzure:mainfrom
scbedd:feature/resolve-tainted-restore
Jun 14, 2023
Merged

Allow Restore to discard pending changes#6330
scbedd merged 6 commits intoAzure:mainfrom
scbedd:feature/resolve-tainted-restore

Conversation

@scbedd
Copy link
Copy Markdown
Member

@scbedd scbedd commented Jun 13, 2023

The original thought is that if you had pending changes, but wanted to swap to a different checked out tag for an assets.json, you would be prevented from doing so with

you have pending changes

So that folks can avoid discarding recordings. However, because a lot of these are running behind a shim or some other surrounding script, folks don't see the proxy output clearly. Because they can't see what's going wrong with the proxy, they don't know what to try next.

This PR will eliminate this scenario.

CC @mssfang @samvaity for FYI

@scbedd scbedd requested a review from mikeharder as a code owner June 13, 2023 00:43
…nd allows us to ensure that a new restore will properly discard changes
@scbedd
Copy link
Copy Markdown
Member Author

scbedd commented Jun 13, 2023

/azp run tools - test-proxy - tests

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Co-authored-by: Ben Broderick Phillips <ben@benbp.net>
@scbedd
Copy link
Copy Markdown
Member Author

scbedd commented Jun 14, 2023

/azp run tools - test-proxy - tests

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@scbedd
Copy link
Copy Markdown
Member Author

scbedd commented Jun 14, 2023

/azp run tools - test-proxy - tests

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@scbedd
Copy link
Copy Markdown
Member Author

scbedd commented Jun 14, 2023

/azp run tools - test-proxy - tests

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@scbedd scbedd enabled auto-merge (squash) June 14, 2023 18:04
@scbedd scbedd merged commit fe71549 into Azure:main Jun 14, 2023
@scbedd scbedd mentioned this pull request Jun 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants