ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/lib/src
Martin von Zweigbergk 7ecd64fde1 merged_tree: use child path when merging child
This fixes a bug where we used the parent directory's path when trying
read trees and files for a child entry. Many tests in
`test_merged_tree` fail after switching to the test backend there
without this fix/
2023-09-18 07:53:19 -07:00
..
lock
protos
backend.rs
commit.rs
commit_builder.rs
conflicts.rs conflicts: leverage Merge::map() in materialize_merge_result() 2023-09-01 16:23:39 -07:00
content_hash.rs content_hash: make public 2023-09-18 07:53:19 -07:00
dag_walk.rs
default_index_store.rs
default_revset_engine.rs
default_revset_graph_iterator.rs
default_submodule_store.rs
diff.rs
file_util.rs
files.rs
fmt_util.rs
fsmonitor.rs
git.rs git: promote imported commits to tree-conflict format if configured 2023-09-08 21:54:43 +09:00
git_backend.rs git: promote imported commits to tree-conflict format if configured 2023-09-08 21:54:43 +09:00
gitignore.rs
hex_util.rs
id_prefix.rs
index.rs
lib.rs content_hash: make public 2023-09-18 07:53:19 -07:00
local_backend.rs
lock.rs
matchers.rs
merge.rs
merged_tree.rs merged_tree: use child path when merging child 2023-09-18 07:53:19 -07:00
op_heads_store.rs
op_store.rs
operation.rs
refs.rs
repo.rs
repo_path.rs repo_path: avoid repeated copying of PathBuf in to_fs_path() 2023-09-09 08:43:29 -07:00
revset.pest revset: add 0-ary "::" and ".." operators as short for "all()" and "~root()" 2023-09-05 10:40:04 +09:00
revset.rs revset: use ancestors(x, 0) in tree substitution test 2023-09-08 09:28:14 +09:00
revset_graph.rs
rewrite.rs
settings.rs cli: rewrite "x | x-" in default log revset as "ancestors(x, 2)" 2023-09-08 09:28:14 +09:00
simple_op_heads_store.rs
simple_op_store.rs
stacked_table.rs
store.rs store: don't include cached objects in Debug format 2023-09-01 16:49:23 -07:00
submodule_store.rs
transaction.rs
tree.rs
tree_builder.rs
view.rs
working_copy.rs working_copy: in LockedWorkingCopy::drop(), discard unsaved changes 2023-09-01 12:25:47 -07:00
workspace.rs