ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

test_abandon_command: test avoidance of simultaneous direct and indirect descendants

Browse source 
This is similar to the following test:

5186066cf5/cli/tests/test_rebase_command.rs (L264-L269) 

from https://github.com/martinvonz/jj/pull/538.
This commit is contained in:
Ilya Grigoriev 2023-11-19 15:36:54 -08:00
parent e5cfada7e2
commit 22ad4d7599
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cli/tests/test_abandon_command.rs
View file

@ -95,6 +95,28 @@ fn test_rebase_branch_with_merge() {
◉ ◉
"###); "###);
// Abandoning `a` would normally result in its descendant merge commit, `e`,
// still having two parents. However, since one of those parents (the root
// commit) would be the ancestor of another, only one of the parents is kept.
test_env.jj_cmd_ok(&repo_path, &["undo"]);
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "a"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Abandoned commit rlvkpnrz 2443ea76 a | a
Rebased 2 descendant commits onto parents of abandoned commits
Working copy now at: znkkpsqq b0af79c3 e | e
Parent commit : vruxwmqv b7c62f28 d | d
Added 0 files, modified 0 files, removed 1 files
"###);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
@ e
◉ d
◉ c
│ ◉ b
├─╯
◉ a
"###);
test_env.jj_cmd_ok(&repo_path, &["undo"]); test_env.jj_cmd_ok(&repo_path, &["undo"]);
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "descendants(c)"]); let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "descendants(c)"]);
insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stdout, @"");
@ -103,7 +125,7 @@ fn test_rebase_branch_with_merge() {
znkkpsqq 5557ece3 e | e znkkpsqq 5557ece3 e | e
vruxwmqv b7c62f28 d | d vruxwmqv b7c62f28 d | d
royxmykx fe2e8e8b c | c royxmykx fe2e8e8b c | c
Working copy now at: xtnwkqum e7bb0612 (empty) (no description set) Working copy now at: wvuyspvk 3f93e69f (empty) (no description set)
Parent commit : rlvkpnrz 2443ea76 a e?? | a Parent commit : rlvkpnrz 2443ea76 a e?? | a
Added 0 files, modified 0 files, removed 3 files Added 0 files, modified 0 files, removed 3 files
"###); "###);
@ -142,7 +164,7 @@ fn test_rebase_branch_with_merge() {
vruxwmqv b7c62f28 d | d vruxwmqv b7c62f28 d | d
zsuskuln 1394f625 b | b zsuskuln 1394f625 b | b
rlvkpnrz 2443ea76 a | a rlvkpnrz 2443ea76 a | a
Working copy now at: xlzxqlsl af874bff (empty) (no description set) Working copy now at: oupztwtk 304ae338 (empty) (no description set)
Parent commit : zzzzzzzz 00000000 a b e?? | (empty) (no description set) Parent commit : zzzzzzzz 00000000 a b e?? | (empty) (no description set)
Added 0 files, modified 0 files, removed 4 files Added 0 files, modified 0 files, removed 4 files
"###); "###);