From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: James Farwell <jfarwell@vmware.com>,
Lars Schneider <larsxschneider@gmail.com>,
Junio C Hamano <gitster@pobox.com>, Sam Hocevar <sam@hocevar.net>,
Eric Sunshine <sunshine@sunshineco.com>,
Luke Diamand <luke@diamand.org>
Subject: [PATCHv2 1/3] git-p4: failing test case for skipping changes with multiple depots
Date: Sat, 19 Dec 2015 09:39:38 +0000 [thread overview]
Message-ID: <1450517980-1744-2-git-send-email-luke@diamand.org> (raw)
In-Reply-To: <1450517980-1744-1-git-send-email-luke@diamand.org>
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>
---
t/t9818-git-p4-block.sh | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh
index 3b3ae1f..64510b7 100755
--- a/t/t9818-git-p4-block.sh
+++ b/t/t9818-git-p4-block.sh
@@ -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
)
}
@@ -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
'
--
2.6.2.474.g3eb3291
next prev parent reply other threads:[~2015-12-19 9:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-19 9:39 [PATCHv2 0/3] git-p4: fixing p4ChangesForPaths Luke Diamand
2015-12-19 9:39 ` Luke Diamand [this message]
2015-12-19 9:39 ` [PATCHv2 2/3] git-p4: support multiple depot paths in p4 submit Luke Diamand
2015-12-19 9:39 ` [PATCHv2 3/3] git-p4: reduce number of server queries for fetches Luke Diamand
2015-12-21 19:27 ` [PATCHv2 0/3] git-p4: fixing p4ChangesForPaths Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450517980-1744-2-git-send-email-luke@diamand.org \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jfarwell@vmware.com \
--cc=larsxschneider@gmail.com \
--cc=sam@hocevar.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).