Skip to content

Commit

Permalink
git-p4: failing test case for skipping changes with multiple depots
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luke Diamand authored and Junio C Hamano committed Dec 14, 2015
1 parent 4b9ab0e commit 785e70f
Showing 1 changed file with 27 additions and 1 deletion.
28 changes: 27 additions & 1 deletion t/t9818-git-p4-block.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ p4_add_file() {
(cd "$cli" &&
>$1 &&
p4 add $1 &&
p4 submit -d "Added a file" $1
p4 submit -d "Added file $1" $1
)
}

Expand Down Expand Up @@ -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' '
kill_p4d
'
Expand Down

0 comments on commit 785e70f

Please sign in to comment.