jj/cli
Martin von Zweigbergk 44eb902171 working_copy: don't crash when updating and tracked file exits on disk
Before this patch, when updating to a commit that has a file that's
currently an ignored file on disk, jj would crash. After this patch,
we instead leave the conflicting files or directories on disk. We
print a helpful message about how to inspect the differences between
the intended working copy and the actual working copy, and how to
discard the unintended changes.

Closes #976.
2023-10-07 14:02:31 -07:00
..
examples
src working_copy: don't crash when updating and tracked file exits on disk 2023-10-07 14:02:31 -07:00
testing
tests working_copy: don't crash when updating and tracked file exits on disk 2023-10-07 14:02:31 -07:00
build.rs
Cargo.toml
LICENSE