[POC] git_backend: reference conflict trees in extra parent #5637
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
This representation of conflicts will make `git status` give a more readable output, and it will prevent files from showing up as new in editors when the parent of the working copy is a conflicted commit. The current representation looks something like this (ignoring some fields in the commit for brevity): ``` commit <conflict>: tree <conflict-tree> parent <parent> jj:trees <side-0> <base-0> <side-1> tree <conflict-tree>: 040000 tree <base-0> .jjconflict-base-0 040000 tree <side-0> .jjconflict-side-0 040000 tree <side-1> .jjconflict-side-1 100644 blob <readme> README ``` The new representation will look something like this, with side 0 of the conflict appearing as the tree of the commit in Git, and the real trees referenced in a separate commit which is added as an extra parent: ``` commit <conflict>: tree <side-0> parent <parent> parent <conflict-metadata-commit> jj:trees-v2 <side-0> <base-0> <side-1> commit <conflict-metadata-commit>: tree <conflict-tree> tree <conflict-tree>: 040000 tree <base-0> .jjconflict-base-0 040000 tree <side-0> .jjconflict-side-0 040000 tree <side-1> .jjconflict-side-1 ```
This file provides a hint if someone checks out a conflicted commit using Git, similarly to the old "README" that was added with the conflict trees.
scott2000
force-pushed
the
conflict-tree-commit
branch
from
fc64902 to
380d4ef
Compare
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.
This is a proof of concept of an alternative way to represent conflicts which would make the
git statusmore clear when a conflicted commit is checked out, as described in #3979 (comment). I mostly just wanted to try it out for fun since I had some free time this weekend; I have no expectation that it'll get merged since it's a pretty large change to how conflicts are represented in the Git backend. 😄Before:
After:
Checklist
If applicable:
CHANGELOG.md