diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-06-17 10:15:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-17 10:15:18 -0700 |
| commit | e7ef93ba7a6c5446b1e199841ff93a9f8e2815ff (patch) | |
| tree | 7cfed8bccf3eda0f0d2f2d975d241deeb24744b9 /t | |
| parent | Merge branch 'js/fsmonitor-unflake' (diff) | |
| parent | git-p4: allow unshelving of branched files (diff) | |
| download | tgif-e7ef93ba7a6c5446b1e199841ff93a9f8e2815ff.tar.xz | |
Merge branch 'sw/git-p4-unshelve-branched-files'
"git p4" update.
* sw/git-p4-unshelve-branched-files:
git-p4: allow unshelving of branched files
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9832-unshelve.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh index 1286a5b824..e9276c48f4 100755 --- a/t/t9832-unshelve.sh +++ b/t/t9832-unshelve.sh @@ -22,7 +22,10 @@ test_expect_success 'init depot' ' : >file_to_move && p4 add file_to_delete && p4 add file_to_move && - p4 submit -d "add files to delete" + p4 submit -d "add files to delete" && + echo file_to_integrate >file_to_integrate && + p4 add file_to_integrate && + p4 submit -d "add file to integrate" ) ' @@ -40,6 +43,7 @@ test_expect_success 'create shelved changelist' ' p4 delete file_to_delete && p4 edit file_to_move && p4 move file_to_move moved_file && + p4 integrate file_to_integrate integrated_file && p4 opened && p4 shelve -i <<EOF Change: new @@ -53,6 +57,7 @@ Files: //depot/file_to_delete //depot/file_to_move //depot/moved_file + //depot/integrated_file EOF ) && @@ -65,6 +70,7 @@ EOF test_path_is_file file2 && test_cmp file1 "$cli"/file1 && test_cmp file2 "$cli"/file2 && + test_cmp file_to_integrate "$cli"/integrated_file && test_path_is_missing file_to_delete && test_path_is_missing file_to_move && test_path_is_file moved_file |