mirrors/jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2025-12-23 06:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
jj/lib/tests
History
Exact
Scott Taylor 2ce2a445b0
Some checks are pending
binaries / Build binary artifacts (push) Waiting to run
Details
website / prerelease-docs-build-deploy (ubuntu-24.04) (push) Waiting to run
Details
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run
Details
conflicts: show "noeol" state separately for each side of a diff 
Now that we can put the "from" and "to" sides on separate lines, we can
use the normal "(no terminating newline)" comment on each side
separately. This should also be more clear, since previously the
"(no terminating newline)" comment could possibly be confused for
"(removes terminating newline)".

Before:

```
<<<<<<< conflict 1 of 1
+++++++ rtsqusxu 2768b0b9 "commit A" (no terminating newline)
grapefruit
%%%%%%% diff from: vpxusssl 38d49363 "merge base"
\\\\\\\        to: ysrnknol 7a20f389 "commit B" (adds terminating newline)
-grape
+grape
>>>>>>> conflict 1 of 1 ends
```

After:

```
<<<<<<< conflict 1 of 1
+++++++ rtsqusxu 2768b0b9 "commit A" (no terminating newline)
grapefruit
%%%%%%% diff from: vpxusssl 38d49363 "merge base" (no terminating newline)
\\\\\\\        to: ysrnknol 7a20f389 "commit B"
-grape
+grape
>>>>>>> conflict 1 of 1 ends
```
2025-12-20 17:43:41 +00:00
..
runner.rs lib/tests: Add basic executable bit tests on Unix 2025-12-04 17:32:40 +00:00
test_annotate.rs lib: replace MergedTreeId with MergedTree and Merge<TreeId> 2025-11-08 14:06:58 +00:00
test_bad_locking.rs op_store: convert OpStore trait to be async 2025-10-19 05:46:00 +00:00
test_bisect.rs cli, lib: convert revset expressions to use Arc over Rc 2025-09-05 16:09:44 +00:00
test_commit_builder.rs rustc_lint: enable let_underscore_drop lint 2025-12-11 13:52:14 +00:00
test_commit_concurrent.rs op_store: convert OpStore trait to be async 2025-10-19 05:46:00 +00:00
test_conflicts.rs conflicts: show "noeol" state separately for each side of a diff 2025-12-20 17:43:41 +00:00
test_default_revset_graph_iterator.rs cleanup: leverage trait upcasting, delete as_any*() 2025-09-20 01:22:47 +00:00
test_eol.rs lib: replace MergedTreeId with MergedTree and Merge<TreeId> 2025-11-08 14:06:58 +00:00
test_evolution_predecessors.rs lib: replace MergedTreeId with MergedTree and Merge<TreeId> 2025-11-08 14:06:58 +00:00
test_fix.rs lib: replace MergedTreeId with MergedTree and Merge<TreeId> 2025-11-08 14:06:58 +00:00
test_git.rs index: add ResolvedChangeTargets to return all commits with change ID 2025-12-16 02:02:31 +00:00
test_git_backend.rs stacked_table: add gc() function to prune unreachable table segments 2025-12-17 10:38:11 +00:00
test_gpg.rs ci: Skip the GPG tests if they cannot pass on macOS 2025-08-23 13:48:25 +00:00
test_id_prefix.rs index: add ResolvedChangeTargets to return all commits with change ID 2025-12-16 02:02:31 +00:00
test_index.rs index: add ResolvedChangeTargets to return all commits with change ID 2025-12-16 02:02:31 +00:00
test_init.rs testutils: add check for strict UTF-8 filesystems 2025-11-27 00:36:39 +00:00
test_load_repo.rs cli, lib: move to Rust 2024 language edition 2025-07-28 17:05:41 +00:00
test_local_working_copy.rs conflicts: materialize conflict labels if present 2025-12-20 04:03:57 +00:00
test_local_working_copy_concurrent.rs lib: replace MergedTreeId with MergedTree and Merge<TreeId> 2025-11-08 14:06:58 +00:00
test_local_working_copy_executable_bit.rs lib/tests: Add basic executable bit tests on Unix 2025-12-04 17:32:40 +00:00
test_local_working_copy_sparse.rs lib: replace MergedTreeId with MergedTree and Merge<TreeId> 2025-11-08 14:06:58 +00:00
test_merge_trees.rs lib: replace MergedTreeId with MergedTree and Merge<TreeId> 2025-11-08 14:06:58 +00:00
test_merged_tree.rs merged_tree: add conflicts_matching() method 2025-12-12 04:29:59 +00:00
test_mut_repo.rs merged_tree: allow passing labels to MergedTree::merge 2025-12-09 14:23:43 +00:00
test_operations.rs index: make Index::has_id fallible 2025-10-25 18:05:13 +00:00
test_refs.rs index: make Index::is_ancestor fallible 2025-10-28 13:47:44 +00:00
test_revset.rs command_error: use offset in hint for divergent changes 2025-12-16 02:02:31 +00:00
test_revset_optimized.rs backend: add conflict labels to Commit 2025-12-09 14:23:43 +00:00
test_rewrite.rs rustc_lint: enable let_underscore_drop lint 2025-12-11 13:52:14 +00:00
test_rewrite_duplicate.rs lib: replace MergedTreeId with MergedTree and Merge<TreeId> 2025-11-08 14:06:58 +00:00
test_rewrite_transform.rs cargo: bump MSRV to 1.88 2025-09-19 01:03:21 +00:00
test_signing.rs cli, lib: move to Rust 2024 language edition 2025-07-28 17:05:41 +00:00
test_ssh_signing.rs ssh-signing: include key in verification result 2025-10-08 13:02:43 +00:00
test_view.rs view: rename remaining local "tag" functions 2025-09-30 13:51:40 +00:00
test_workspace.rs testutils: add check for strict UTF-8 filesystems 2025-11-27 00:36:39 +00:00