Allow deleting files in diffedit and split #5481
Closed
+35
−53
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
This uses some code from jj-vcs#4078 but has a slightly different underlying approach based on arxanas/scm-record#62 (comment).
|
Also not done, this doesn't reproduce the logic from the previous set of PRs regarding empty files vs. |
|
Closing so as not to crowd the PR view while this is in progress, anyone interested can see the changes on the closed PR. Will re-file once the issues are addressed |
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.
An early proof of concept, extending #4078 but with a slightly different approach based on arxanas/scm-record#62 (comment).
It relies on changes in arxanas/scm-record#92 to function.
I haven't tested it extensively yet, but wanted to get a pull request up so it's possible to review this in tandem with arxanas/scm-record#92 if it's helpful.
Attempts to fix #3702 and seems to fix #3846 too.
Checklist
If applicable:
CHANGELOG.md