From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Jun 2019 17:15:18 +0000 (-0700)
Subject: Merge branch 'sw/git-p4-unshelve-branched-files'
X-Git-Tag: v2.23.0-rc0~113
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e7ef93ba7a6c5446b1e199841ff93a9f8e2815ff?hp=-c

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

"git p4" update.

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

e7ef93ba7a6c5446b1e199841ff93a9f8e2815ff
diff --combined t/t9832-unshelve.sh
index 1286a5b824,cde9f86cd6..e9276c48f4
--- a/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