Fix undo/redo merge bugs #885
Merged
Conversation
This file contains 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
corranwebster
added
the
need backport to 7.2
rahulporuri
approved these changes
Feb 9, 2021
pyface/undo/command_stack.py
Outdated
| @@ -201,6 +201,9 @@ def push(self, command): | |||
|
|
|||
| # Do nothing more if the command was merged. | |||
There was a problem hiding this comment.
this comment needs to be updated - or removed - given the recent changes.
|
Also, given that the 7.3.0 release is imminent, do we need to backport this PR to the 7.2 maintenance branch for a 7.2.1 bug fix release? We could backport the changes purely in principle, in case someone requests a 7.2.1 specifically and can't use 7.3.0. |
|
If 7.3 is about to come out, then we don't need to do the backport, but maybe keep the flag on the PR in case for some reason we later need a 7.2.1 release and then we can easily work out what needs to be backported. |
Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>
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.
Add tests for undo/redo and fix #883 and fix #884
Not much more.