Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow deleting files in diffedit and split #5481

Closed
wants to merge 2 commits into from

Conversation

jgilchrist
Copy link
Contributor

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:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

This uses some code from jj-vcs#4078 but
has a slightly different underlying approach based on
arxanas/scm-record#62 (comment).
@jgilchrist jgilchrist marked this pull request as draft January 26, 2025 19:08
@jgilchrist
Copy link
Contributor Author

Also not done, this doesn't reproduce the logic from the previous set of PRs regarding empty files vs. Absent so empty files are not dealt with correctly yet.

@jgilchrist
Copy link
Contributor Author

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

@jgilchrist jgilchrist closed this Jan 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant