Ilya Grigoriev 1b658ea80e lib id_prefix: look for divergent changes outside short prefix set ...

Fixes #2476.

Previously, if there was a change id match within the short prefix
lookup set, `jj` would not look for commits with that same change id
outside the short prefix set. So, it wouldn't find the conflicted
commits for a commit with a divergent (AKA conflicted) change id.

2024-06-29 11:44:26 -07:00

..

runner.rs

repo: add method for tranforming descendants, use in rebase_descendants()

2024-04-18 21:06:52 -07:00

test_bad_locking.rs

transaction: take description at end instead of start

2023-12-13 08:12:49 -08:00

test_commit_builder.rs

commit_builder: reset author timestamp on discardable commits

2024-06-29 08:35:53 -05:00

test_commit_concurrent.rs

op_store: add a virtual root operation, similar to root commit

2024-01-14 10:15:14 -08:00

test_conflicts.rs

conflicts: propagate error from conflict materialization

2024-06-17 14:33:29 +09:00

test_default_revset_graph_iterator.rs

revset_graph: rename to graph and make generic over graph node type

2024-05-31 02:39:34 +08:00

test_diff_summary.rs

repo_path: split RepoPath into owned and borrowed types

2023-11-28 07:33:28 +09:00

test_git_backend.rs

tests: compare git refs loaded from disk, not in-memory cache values

2024-04-22 18:46:28 +09:00

test_git.rs

view: remove has_branch() which is called only from tests

2024-06-28 10:29:06 +09:00

test_gpg.rs

gpg_signing: handle early termination of gpg command in verify path

2024-03-03 18:35:10 +09:00

test_id_prefix.rs

lib id_prefix: look for divergent changes outside short prefix set

2024-06-29 11:44:26 -07:00

test_index.rs

repo/workspace: drop support for old repo formats

2024-06-11 22:03:20 +09:00

test_init.rs

cleanup: propagate errors from Commit::predecessors()

2024-05-13 07:39:14 -07:00

test_load_repo.rs

transaction: take description at end instead of start

2023-12-13 08:12:49 -08:00

test_local_working_copy_concurrent.rs

repo_path: split RepoPath into owned and borrowed types

2023-11-28 07:33:28 +09:00

test_local_working_copy_sparse.rs

working_copy: use proto file states without rebuilding BTreeMap

2023-11-30 12:09:31 +09:00

test_local_working_copy.rs

feat: add an option to monitor the filesystem asynchronously

2024-06-16 23:24:22 -04:00

test_merge_trees.rs

tree_builder: propagate errors from write_tree()

2024-05-22 06:46:38 -07:00

test_merged_tree.rs

merged_tree: make tree builder attempt to resolve conflicts

2024-06-08 20:29:30 +09:00

test_mut_repo.rs

repo: consider empty and undescribed merge commits as discardable

2024-05-29 06:54:30 -07:00

test_operations.rs

operation: add shorthand for .store_operation().metadata

2024-02-25 09:00:56 +09:00

test_refs.rs

jj git push: safety checks in push negotiation, "force-with-lease"

2024-05-28 21:38:26 -07:00

test_revset.rs

give descendants a range arg

2024-06-13 18:54:57 -06:00

test_rewrite_transform.rs

rewrite: add CommitRewriter::record_abandoned_commit()

2024-04-30 20:03:57 -07:00

test_rewrite.rs

repo: when abandoning a working copy that a merge, recreate it

2024-05-29 06:54:30 -07:00

test_signing.rs

transaction: take description at end instead of start

2023-12-13 08:12:49 -08:00

test_ssh_signing.rs

sign: Add SSH backend tests

2024-02-20 00:02:08 +00:00

test_view.rs

view: drop tracking of public heads

2024-01-13 22:23:57 -08:00

test_workspace.rs

working_copy: add Send supertrait

2024-02-17 15:13:25 +08:00