Martin von Zweigbergk b5378caa81 cli: make jj move/squash/unsquash ask for combined description ... In 8ae9540f2c, I made `jj move/squash/unsquash` not abandon the working copy if it became empty because that would lose any description associated with it. It turned out that the new behavior was also confusing because it made it unclear if the working-copy commit was actually abandoned. Let's roll back that change and instead ask the user for a combined description when both the source and destination commits have non-empty descriptions. Not discarding a non-empty description seems like a good improvement regardless of the behavior related to working-copy commits. It's also how `hg fold` behaves (though hg doesn't allow the description to be empty).		2022-08-30 21:41:26 -07:00
..
common	tests: stop libgit2 from accessing config files	2022-08-30 14:45:02 -07:00
smoke_test.rs	cli: show placeholder text for empty commit message	2022-05-18 09:16:04 -07:00
test_alias.rs	cli: make jj branch take subcommands, not flags	2022-06-06 09:02:56 -07:00
test_branch_command.rs	cli: make jj branch take subcommands, not flags	2022-06-06 09:02:56 -07:00
test_checkout.rs	cli: disable open commits by default	2022-08-26 23:34:52 -07:00
test_concurrent_operations.rs	cli: show placeholder text for empty commit message	2022-05-18 09:16:04 -07:00
test_describe_command.rs	cli: make jj move/squash/unsquash ask for combined description	2022-08-30 21:41:26 -07:00
test_diff_command.rs	diff: make sure word diff print final newline	2022-07-07 23:29:18 +09:00
test_edit_command.rs	cli: add jj edit for editing a commit in the wokring copy	2022-07-01 08:58:08 +08:00
test_git_clone.rs	cli: check that clone target is an empty dir if it exists	2022-07-01 09:03:24 +08:00
test_git_colocated.rs	cli: make jj branch take subcommands, not flags	2022-06-06 09:02:56 -07:00
test_git_push.rs	cli: push only branches pointing to @ by default	2022-07-13 16:23:13 -07:00
test_git_remotes.rs	cli: add a command for listing git remotes and their URLs	2022-04-29 14:08:24 -07:00
test_gitignores.rs	tests: move testutils from src/ to tests/	2022-04-02 14:22:58 -07:00
test_global_opts.rs	cli: rename jj edit to jj touchup	2022-07-01 08:58:08 +08:00
test_init_command.rs	cli: show placeholder text for empty commit message	2022-05-18 09:16:04 -07:00
test_log_command.rs	cli: show placeholder text for empty commit message	2022-05-18 09:16:04 -07:00
test_move_command.rs	cli: make jj move/squash/unsquash ask for combined description	2022-08-30 21:41:26 -07:00
test_new.rs	checkout: don't abandon old commit if it has non-empty description	2022-05-21 22:12:15 -07:00
test_obslog_command.rs	cli: make jj move/squash/unsquash ask for combined description	2022-08-30 21:41:26 -07:00
test_operations.rs	graphlog: don't de-indent multi-line text at end of chain	2022-05-11 04:42:44 -07:00
test_print_command.rs	tests: re-run with insta crate version b9d99e87065b	2022-04-28 16:55:10 -07:00
test_rebase_command.rs	tests: replace a jj open X; jj co X by jj edit X	2022-08-26 23:34:52 -07:00
test_restore_command.rs	cli: show placeholder text for empty commit message	2022-05-18 09:16:04 -07:00
test_sparse_command.rs	tests: re-run with insta crate version b9d99e87065b	2022-04-28 16:55:10 -07:00
test_split_command.rs	cli: show placeholder text for empty commit message	2022-05-18 09:16:04 -07:00
test_squash_command.rs	cli: make jj move/squash/unsquash ask for combined description	2022-08-30 21:41:26 -07:00
test_touchup_command.rs	cli: make jj move/squash/unsquash ask for combined description	2022-08-30 21:41:26 -07:00
test_undo.rs	cli: show placeholder text for empty commit message	2022-05-18 09:16:04 -07:00
test_unsquash_command.rs	cli: make jj move/squash/unsquash ask for combined description	2022-08-30 21:41:26 -07:00
test_untrack_command.rs	cli: snapshot working copy even on e.g. jj diff -r <some hash>	2022-07-29 22:06:53 +02:00
test_workspaces.rs	cli: make jj move/squash/unsquash ask for combined description	2022-08-30 21:41:26 -07:00