diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 21:27:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 21:27:15 (GMT) |
| commit | fe3ec21fb03e7d02d00fc845e7a7d3e692bb67a2 (patch) | |
| tree | d62ce076a39b37df4caaf93fc10155dd4f86b44d /t | |
| parent | 2c30e34e1a50f9d14fce8f97f3639ac0ebccd819 (diff) | |
| parent | 0108f47eb30b9b473e044285b731e2fbca803170 (diff) | |
| download | git-fe3ec21fb03e7d02d00fc845e7a7d3e692bb67a2.zip git-fe3ec21fb03e7d02d00fc845e7a7d3e692bb67a2.tar.gz git-fe3ec21fb03e7d02d00fc845e7a7d3e692bb67a2.tar.bz2 | |
Merge branch 'sw/git-p4-unshelve-branched-files' into maint
"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 1286a5b..e9276c4 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 |