Martin von Zweigbergk e02622b143 repo: when abandoning a working copy that a merge, recreate it ... I recently needed to test something on top of a two branches at the same time, so I created a new commit on top of both of them (i.e. a merge commit). I then ran tests and made some adjustments to the code. These adjustments belonged in one of the parent branches, so I used `jj squash --into` to squash it in there. Unfortunately, that meant that my working copy became a single-parent commit based on one of the branches only. We already had #2859 for tracking this issue. This patch changes the behavior so we create a new working-copy commit with all of the previous parents.		2024-05-29 06:54:30 -07:00
..
common
cli-reference@.md.snap
runner.rs	conflicts: always use tree-level format for merged trees	2024-05-27 06:25:27 -07:00
test_abandon_command.rs	repo: when abandoning a working copy that a merge, recreate it	2024-05-29 06:54:30 -07:00
test_advance_branches.rs
test_alias.rs	cli: add space around = in jj config list output	2024-05-24 19:35:45 -07:00
test_branch_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_builtin_aliases.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_cat_command.rs	conflicts: label closing delimeter with conflict number	2024-05-20 18:36:51 -07:00
test_checkout.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_chmod_command.rs	conflicts: label closing delimeter with conflict number	2024-05-20 18:36:51 -07:00
test_commit_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_commit_template.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_concurrent_operations.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_config_command.rs	cli: add space around = in jj config list output	2024-05-24 19:35:45 -07:00
test_debug_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_describe_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_diff_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_diffedit_command.rs	conflicts: label closing delimeter with conflict number	2024-05-20 18:36:51 -07:00
test_duplicate_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_edit_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_generate_md_cli_help.rs
test_git_clone.rs
test_git_colocated.rs	cli: don't abandon non-discardable old wc commit by import_git_head()	2024-05-25 10:29:30 +09:00
test_git_fetch.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_git_import_export.rs	cargo: upgrade gix to version 0.63	2024-05-22 11:20:57 -07:00
test_git_init.rs
test_git_push.rs	test_git_push: test unexpectedly deleted branch	2024-05-29 00:57:50 -07:00
test_git_remotes.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_git_submodule.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_gitignores.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_global_opts.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_immutable_commits.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_init_command.rs
test_interdiff_command.rs	conflicts: label closing delimeter with conflict number	2024-05-20 18:36:51 -07:00
test_log_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_move_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_new_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_next_prev_commands.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_obslog_command.rs	conflicts: label closing delimeter with conflict number	2024-05-20 18:36:51 -07:00
test_operations.rs	conflicts: consider the empty tree a non-legacy tree	2024-05-27 06:25:27 -07:00
test_parallelize_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_rebase_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_repo_change_report.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_resolve_command.rs	conflicts: label closing delimeter with conflict number	2024-05-20 18:36:51 -07:00
test_restore_command.rs	conflicts: label closing delimeter with conflict number	2024-05-20 18:36:51 -07:00
test_revset_output.rs	revset: implement a 'reachable(src, domain)' expression	2024-05-21 10:52:31 -04:00
test_root.rs
test_shell_completion.rs
test_show_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_sparse_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_split_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_squash_command.rs	conflicts: label closing delimeter with conflict number	2024-05-20 18:36:51 -07:00
test_status_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_tag_command.rs
test_templater.rs	templater: attach alias traces to function parameter	2024-05-18 09:53:52 +09:00
test_undo.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_unsquash_command.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_untrack_command.rs
test_util_command.rs
test_working_copy.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00
test_workspaces.rs	tests: avoid deprecated jj init --git/--git-repo	2024-05-17 13:55:20 -07:00