From 8c4fa90e2e94f1c2f096117e08b90e9e7cda0bd6 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Sat, 4 Feb 2023 00:24:48 -0800 Subject: [PATCH] Add test for error on `jj rebase -d large_revset` + test of repeats --- tests/test_rebase_command.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/test_rebase_command.rs b/tests/test_rebase_command.rs index 73f8ab462..ba90a8e15 100644 --- a/tests/test_rebase_command.rs +++ b/tests/test_rebase_command.rs @@ -314,6 +314,19 @@ fn test_rebase_multiple_destinations() { o "###); + let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-r", "a", "-d", "b|c"]); + insta::assert_snapshot!(stderr, @r###" + Error: Revset "b|c" resolved to more than one revision + Hint: The revset "b|c" resolved to these revisions: + fe2e8e8b50b3 c + d370aee184ba b + "###); + + let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-r", "a", "-d", "b", "-d", "b"]); + insta::assert_snapshot!(stderr, @r###" + Error: Revset "b" and "b" resolved to the same revision d370aee184ba + "###); + let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-r", "a", "-d", "b", "-d", "root"]); insta::assert_snapshot!(stderr, @r###"