From: Eric Sunshine <sunshine@sunshineco.com>
To: Luke Diamand <luke@diamand.org>
Cc: "Git List" <git@vger.kernel.org>,
"vin ku" <viniciusalexandre@gmail.com>,
"Romain Merland" <merlorom@yahoo.fr>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Vitor Antunes" <vitor.hda@gmail.com>,
amazo@checkvideo.com, aoakley@roku.com
Subject: Re: [PATCH 1/2] git-p4: add failing test for shelved CL update involving move
Date: Sun, 13 Jan 2019 16:57:42 -0500 [thread overview]
Message-ID: <CAPig+cSPL4vcfWR7Pos91N_SO-qCSBMYFY8vbyHX-POKyyRJpg@mail.gmail.com> (raw)
In-Reply-To: <20190113135815.11286-2-luke@diamand.org>
On Sun, Jan 13, 2019 at 8:58 AM Luke Diamand <luke@diamand.org> wrote:
> Updating a shelved P4 changelist where one or more of the files have
> been moved does not work. Add a test for this.
Perhaps this message could give more detail about the actual problem
than the generic "does not work" which provides no useful information.
> Signed-off-by: Luke Diamand <luke@diamand.org>
> ---
> diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
> @@ -500,6 +500,12 @@ test_expect_success 'submit --shelve' '
> +last_shelve() {
> + change=$(p4 -G changes -s shelved -m 1 //depot/... | \
> + marshal_dump change)
> + echo $change
> +}
A simpler definition for this function would be:
last_shelve () {
p4 -G changes -s shelved -m 1 //depot/... | marshal_dump change
}
which will give the same result when you later capture its output with:
change=$(last_shelve) &&
> @@ -533,12 +539,53 @@ test_expect_success 'submit --update-shelve' '
> ) &&
> (
> cd "$cli" &&
> - change=$(p4 -G changes -s shelved -m 1 //depot/... | \
> - marshal_dump change) &&
> + change=$(last_shelve) &&
> p4 unshelve -c $change -s $change &&
> grep -q updated-line shelf.t &&
> p4 describe -S $change | grep added-file.t &&
> - test_path_is_missing shelved-change-1.t
> + test_path_is_missing shelved-change-1.t &&
> + p4 revert ...
> + )
> +'
next prev parent reply other threads:[~2019-01-13 21:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-13 13:58 [PATCH 0/2] git-p4: handle moved files when updating a P4 shelve Luke Diamand
2019-01-13 13:58 ` [PATCH 1/2] git-p4: add failing test for shelved CL update involving move Luke Diamand
2019-01-13 13:58 ` [PATCH 2/2] git-p4: handle update of moved files when updating a shelve Luke Diamand
2019-01-13 21:57 ` Eric Sunshine [this message]
2019-01-14 19:03 ` [PATCH 1/2] git-p4: add failing test for shelved CL update involving move Junio C Hamano
2019-01-14 18:56 ` [PATCH 0/2] git-p4: handle moved files when updating a P4 shelve 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=CAPig+cSPL4vcfWR7Pos91N_SO-qCSBMYFY8vbyHX-POKyyRJpg@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=amazo@checkvideo.com \
--cc=aoakley@roku.com \
--cc=git@vger.kernel.org \
--cc=luke@diamand.org \
--cc=merlorom@yahoo.fr \
--cc=szeder.dev@gmail.com \
--cc=viniciusalexandre@gmail.com \
--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.
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).