mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-27 06:27:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: remove a duplicate code block

Browse source 
It looks like this has been duplicated since I added the test in
cd4fbd3565.
This commit is contained in:
Martin von Zweigbergk 2023-07-27 11:10:25 -07:00 committed by Martin von Zweigbergk
parent 1e28b312c6
commit 2ccd3247f9
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/tests/test_working_copy.rs
View file

@ -357,21 +357,6 @@ fn test_reset() {
assert_eq!(new_tree_id, *tree_without_file.id()); assert_eq!(new_tree_id, *tree_without_file.id());
locked_wc.discard(); locked_wc.discard();
// After we reset to the commit without the file, it should still exist on disk,
// but it should not be in the tree state, and it should not get added when we
// commit the working copy (because it's ignored).
let mut locked_wc = wc.start_mutation().unwrap();
locked_wc.reset(&tree_without_file).unwrap();
locked_wc.finish(repo.op_id().clone()).unwrap();
assert!(ignored_path.to_fs_path(&workspace_root).is_file());
assert!(!wc.file_states().unwrap().contains_key(&ignored_path));
let mut locked_wc = wc.start_mutation().unwrap();
let new_tree_id = locked_wc
.snapshot(SnapshotOptions::empty_for_test())
.unwrap();
assert_eq!(new_tree_id, *tree_without_file.id());
locked_wc.discard();
// Now test the opposite direction: resetting to a commit where the file is // Now test the opposite direction: resetting to a commit where the file is
// tracked. The file should become tracked (even though it's ignored). // tracked. The file should become tracked (even though it's ignored).
let mut locked_wc = wc.start_mutation().unwrap(); let mut locked_wc = wc.start_mutation().unwrap();