mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-24 07:32:54 +00:00
256988de65
We do a 3-way merge of repo views in a few different scenarios. Perhaps the most obvious one is when merging concurrent operations. Another case is when undoing an operation. One step of the 3-way repo view merge is to find which added commits are rewrites of which removed commits (by comparing change IDs). With the high commit rate in the Google repo (combined with storing the commits on a server), this step can get extremely slow. This patch adds a hack to disable the slow step when using a non-standard `Index` implementation. The Google index is the only non-standard implementation I'm aware of, so I don't think this will affect anyone else. The patch is also small enough that I don't think it will cause much maintenance overhead for the project. |
||
|---|---|---|
| .. | ||
| benches | ||
| gen-protos | ||
| proc-macros | ||
| src | ||
| tests | ||
| testutils | ||
| Cargo.toml | ||
| LICENSE | ||