git-p4: failing test case for skipping changes with multiple depots
James Farwell reported that with multiple depots git-p4 would skip changes. http://article.gmane.org/gmane.comp.version-control.git/282297 Add a failing test case demonstrating the problem. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
							parent
							
								
									4b9ab0ee01
								
							
						
					
					
						commit
						785e70f467
					
				|  | @ -84,7 +84,7 @@ p4_add_file() { | ||||||
| 	(cd "$cli" && | 	(cd "$cli" && | ||||||
| 		>$1 && | 		>$1 && | ||||||
| 		p4 add $1 && | 		p4 add $1 && | ||||||
| 		p4 submit -d "Added a file" $1 | 		p4 submit -d "Added file $1" $1 | ||||||
| 	) | 	) | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -112,6 +112,32 @@ test_expect_success 'Syncing files' ' | ||||||
| 	) | 	) | ||||||
| ' | ' | ||||||
|  |  | ||||||
|  | # Handling of multiple depot paths: | ||||||
|  | #    git p4 clone //depot/pathA //depot/pathB | ||||||
|  | # | ||||||
|  | test_expect_success 'Create a repo with multiple depot paths' ' | ||||||
|  | 	client_view "//depot/pathA/... //client/pathA/..." \ | ||||||
|  | 		    "//depot/pathB/... //client/pathB/..." && | ||||||
|  | 	mkdir -p "$cli/pathA" "$cli/pathB" && | ||||||
|  | 	for p in pathA pathB | ||||||
|  | 	do | ||||||
|  | 		for i in $(test_seq 1 10) | ||||||
|  | 		do | ||||||
|  | 			p4_add_file "$p/file$p$i" | ||||||
|  | 		done | ||||||
|  | 	done | ||||||
|  | ' | ||||||
|  |  | ||||||
|  | test_expect_failure 'Clone repo with multiple depot paths' ' | ||||||
|  | 	( | ||||||
|  | 		cd "$git" && | ||||||
|  | 		git p4 clone --changes-block-size=4 //depot/pathA@all //depot/pathB@all \ | ||||||
|  | 			--destination=dest && | ||||||
|  | 		ls -1 dest >log && | ||||||
|  | 		test_line_count = 20 log | ||||||
|  | 	) | ||||||
|  | ' | ||||||
|  |  | ||||||
| test_expect_success 'kill p4d' ' | test_expect_success 'kill p4d' ' | ||||||
| 	kill_p4d | 	kill_p4d | ||||||
| ' | ' | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Luke Diamand
						Luke Diamand