Merge branch 'sw/git-p4-unshelve-branched-files'

"git p4" update.

* sw/git-p4-unshelve-branched-files:
git-p4: allow unshelving of branched files

diff --combined t/t9832-unshelve.sh
index 1286a5b824b77d71061fb890d9f528b46ecc087d,cde9f86cd6996f05b45d698e3f114d2e7da613a0..e9276c48f4a2e795899a03681a737c70635ab39c
--- 1/t/t9832-unshelve.sh
--- 2/t/t9832-unshelve.sh
+++ b/t/t9832-unshelve.sh
@@@ -22,7 -22,10 +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 +43,7 @@@ test_expect_success 'create shelved cha
                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 +57,7 @@@ Files
        //depot/file_to_delete
        //depot/file_to_move
        //depot/moved_file
+       //depot/integrated_file
  EOF
  
        ) &&
@@@ -65,6 -70,7 +70,7 @@@
                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
@@@ -174,5 -180,8 +180,5 @@@ test_expect_success 'unshelve specifyin
                test_path_is_file file_to_shelve
        )
  '
 -test_expect_success 'kill p4d' '
 -      kill_p4d
 -'
  
  test_done