From: Pete Wyckoff <pw@padd.com>
To: Vitor Antunes <vitor.hda@gmail.com>
Cc: git@vger.kernel.org, Luke Diamand <luke@diamand.org>
Subject: Re: [PATCH] git p4 test: Check ignore files with client spec
Date: Sat, 20 Jul 2013 09:48:37 -0400 [thread overview]
Message-ID: <20130720134837.GB18479@padd.com> (raw)
In-Reply-To: <1374188693-547-1-git-send-email-vitor.hda@gmail.com>
vitor.hda@gmail.com wrote on Fri, 19 Jul 2013 00:04 +0100:
> This test confirms that a file can be ignored during git p4 sync if if is
> excluded in P4 client specification.
This is a good check to have, and I'm glad it happens to work. :)
I'd forgotten during your conversation with Matthieu that we
did indeed have tests for detect-branches with use-client-spec.
This test sure seems like it should cover that situation though.
Acked-by: Pete Wyckoff <pw@padd.com>
> ---
> t/t9801-git-p4-branch.sh | 23 ++++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
> index 9730821..2bf142d 100755
> --- a/t/t9801-git-p4-branch.sh
> +++ b/t/t9801-git-p4-branch.sh
> @@ -469,9 +469,11 @@ test_expect_success 'use-client-spec detect-branches skips branches setup' '
> View: //depot/usecs/b1/... //depot/usecs/b3/...
> EOF
>
> - echo b3/b3-file3 >b3/b3-file3 &&
> - p4 add b3/b3-file3 &&
> - p4 submit -d "b3/b3-file3"
> + echo b3/b3-file3_1 >b3/b3-file3_1 &&
> + echo b3/b3-file3_2 >b3/b3-file3_2 &&
> + p4 add b3/b3-file3_1 &&
> + p4 add b3/b3-file3_2 &&
> + p4 submit -d "b3/b3-file3_1 b3/b3-file3_2"
> )
> '
>
> @@ -487,6 +489,21 @@ test_expect_success 'use-client-spec detect-branches skips branches' '
> )
> '
>
> +test_expect_success 'use-client-spec detect-branches skips files in branches' '
> + client_view "//depot/usecs/... //client/..." \
> + "-//depot/usecs/b3/b3-file3_1 //client/b3/b3-file3_1" &&
> + test_when_finished cleanup_git &&
> + test_create_repo "$git" &&
> + (
> + cd "$git" &&
> + git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
> + git checkout -b master p4/usecs/b3 &&
> + test_path_is_file b1-file1 &&
> + test_path_is_file b3-file3_2 &&
> + test_path_is_missing b3-file3_1
> + )
> +'
> +
> test_expect_success 'kill p4d' '
> kill_p4d
> '
> --
> 1.8.3.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2013-07-20 13:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-18 23:04 [PATCH] git p4 test: Check ignore files with client spec Vitor Antunes
2013-07-20 13:48 ` Pete Wyckoff [this message]
2013-07-20 14:59 ` Vitor Antunes
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130720134837.GB18479@padd.com \
--to=pw@padd.com \
--cc=git@vger.kernel.org \
--cc=luke@diamand.org \
--cc=vitor.hda@gmail.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.
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 NNTP newsgroup(s).