mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-07 00:12:49 +00:00
bb902b69b5
This reverts commit b8ca9ae and adds a comment. In commit 4d42604 (a year ago), we started writing the trees involved in conflicted commits to the Git commit object in addition to the proto storage. We validated that the two record matched when reading commits until as recently as f7b14be (about a week ago). Just after that, in commit b8ca9ae, we stopped writing the tree ids to the proto storage. That means that any version of jj between 4d42604 and f7b14be would error fail when reading a conflicted commit created by new versions. While we don't guarantee forward compatibility, it's easy to do so here, so let's be friendly to older versions by rolling back b8ca9ae so we continue to write the conflicted tree ids to both places for a while more. (Thanks to Martin for the detailed explanation!) Fixes https://github.com/jj-vcs/jj/issues/6185