Skip to content

Implement a tree diff, that allows to compare directory trees #8622

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

matthiasblaesing
Copy link
Contributor

Usage: Select exactly two folder entries in the project/files/favorites, open the context menu and select "Tools" -> "Tree diff"

grafik

This results in a flattened view of the difference between the two trees:

grafik

  • Entries with red background are present in the source, but not in the target
  • Entries with blue background are present in both locations but differ
  • Entries with green background are present in the target, but not in the source

The list of modified files/folder can be display as hierarchy:

grafik

When a modified file is selected the diff view shows both versions and allows to update the target:

grafik

Additionally actions can be invoked directly on the difference entries:

grafik

grafik

grafik

Closes: #8349

@matthiasblaesing matthiasblaesing added the ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) label Jun 24, 2025
@mbien mbien added Editor UI User Interface labels Jun 24, 2025
@matthiasblaesing
Copy link
Contributor Author

As this has little side effects and would be trivial to remove, I intent to merge at the end of week, unless someone objects.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) Editor UI User Interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Diff for folders
2 participants