forked from mirrors/jj
4fa2a27f38
If we don't have a recorded state for a file, we assume that it's new, so we add it to the tree as the type it appears on disk. That means we won't check if it exists as a conflict in the current tree. As another step towards making the file state just a cache, let's instead treat this case as a dirty file, so we look up the current value from the tree. That means that adding files will be a tiny bit slower, but I doubt it will be noticeable (we need to read the file from disk and write it to the backend anyway). |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
Cargo.toml |