Correct the deprecation path for MergeConflictException #1243
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We want users to be able to have the old name in their code and catch the new type which we throw. To enable this we must switch the inheritance for the old vs new type.
| @@ -1029,6 +1029,23 @@ public void CanCheckoutPathFromCurrentBranch(string fileName) | |||
| } | |||
| } | |||
|
|
|||
| [Fact] | |||
| public void CanCatchDeprecatedException() | |||
There was a problem hiding this comment.
I don't think we necessarily need to assert this behavior.
|
Looks good (I don't think we need to assert the ability to catch obsolete exceptions, though) |
|
The test was my way of figuring out what would work and I just left it there since it should help us avoid regressions till the release. The plan was to remove it just after the release when we delete the old name anyway, but sure, we don't have to include it here. |
|
That works as well! Either way seems fine. Thanks! |
|
👍 for me. @whoisj any comment? |
|
I think this should be fine. Does seem to make more sense this way around. |
nulltoken
added a commit
that referenced
this pull request
Dec 13, 2015
Correct the deprecation path for MergeConflictException
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We want users to be able to have the old name in their code and catch the
new type which we throw. To enable this we must switch the inheritance for
the old vs new type.