Yuya Nishihara 11b9888cdf refs: retry trivial resolution after merging targets ...

This helps resolve diverged refs by abandoning both sides:

    D  ref = [D]
    |\
    | C       C  ref = [B - D + C]
    | |       |
    B |     B |     B  ref = [B - D + A]
    |/      |/      |
    A       A       A       A  ref = [A - D + A]

2024-09-02 09:20:16 +09:00

..

runner.rs

merged_tree: remove .diff_summary()

2024-08-06 10:15:44 +09:00

test_bad_locking.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_commit_builder.rs

merged_tree: rename diff entry field from "value" to "values"

2024-08-23 10:29:12 +09:00

test_commit_concurrent.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_conflicts.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_default_revset_graph_iterator.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_git_backend.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_git.rs

op log: change "resolve concurrent" to "reconcile divergent"

2024-08-30 21:56:11 -07:00

test_gpg.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_id_prefix.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_index.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_init.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_load_repo.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_local_working_copy_concurrent.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_local_working_copy_sparse.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_local_working_copy.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_merge_trees.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_merged_tree.rs

copies: determine copy/rename operation by CopiesTreeDiffStream

2024-08-23 10:29:12 +09:00

test_mut_repo.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_operations.rs

cleanup: remove redundant ::{self} from use declarations

2024-08-23 13:05:27 +09:00

test_refs.rs

refs: retry trivial resolution after merging targets

2024-09-02 09:20:16 +09:00

test_revset.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_rewrite_transform.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_rewrite.rs

rewrite: ensure that rewritten refs move across divergent entries

2024-09-01 11:11:12 +09:00

test_signing.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_ssh_signing.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_view.rs

op log: change "resolve concurrent" to "reconcile divergent"

2024-08-30 21:56:11 -07:00

test_workspace.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00