git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/2] git-p4: add failing test for shelved CL update involving move

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 14, 2019, 19:03 UTC
Message-ID
<xmqqr2dfuknm.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CAPig+cSPL4vcfWR7Pos91N_SO-qCSBMYFY8vbyHX-POKyyRJpg@mail.gmail.com>
Eric Sunshine <sunshine@sunshineco.com> writes:
Show 22 quoted lines
> 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
> }

Indeed, and it will work better even when the output from marshal_dump has $IFS and other traits that do not survive "echo $change" intact.

Previous: Eric SunshineNext: Junio C Hamano
Message 5 of 6 in “git-p4: handle moved files when updating a P4 shelve”
  1. 0/2 git-p4: handle moved files when updating a P4 shelveLuke Diamand, Jan 13, 2019
  2. 1/2 git-p4: add failing test for shelved CL update involving moveLuke Diamand, Jan 13, 2019
  3. 2/2 git-p4: handle update of moved files when updating a shelveLuke Diamand, Jan 13, 2019
  4. Eric SunshineJan 13, 2019
  5. Junio C HamanoJan 14, 2019
  6. Junio C HamanoJan 14, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.