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

Re: [PATCH 1/1] git-p4: unshelve: use action==add instead of rev==none

From
MAMazo, Andrey <amazo@checkvideo.com>
Date
May 23, 2018, 19:38 UTC
Message-ID
<BYAPR08MB38455AFE85AE6B04EB31EF92DA6B0@BYAPR08MB3845.namprd08.prod.outlook.com>
In-Reply-To
<CAE5ih79RoyA87gsb8PTOz9n1niTU5tDM_WkzbpFADS1d00h8eQ@mail.gmail.com>
Show 11 quoted lines
>> This was actually discussed in a separate thread [1] some time ago with patches proposed by Thandesha and me.
>> I haven't yet got time to cook a final patch, which addresses both Thandesha's and mine use-cases though,
>> so this wasn't submitted to Junio yet.
>> In the meantime, I guess, one of the patches [2] from that thread can be taken as is.
>>
>> [1] "[BUG] git p4 clone fails when p4 sizes does not return 'fileSize' key"
>>        https://public-inbox.org/git/CAJJpmi-pLb4Qcka5aLKXA8B1VOZFFF+OAQ0fgUq9YviobRpYGg@mail.gmail.com/t/#mee2ec50a40242089741f808f06214a44278055b3
>> [2] "[PATCH 1/1] git-p4: fix `sync --verbose` traceback due to 'fileSize'"
>>        https://public-inbox.org/git/2e2b2add4e4fffa4228b8ab9f6cd47fa9bf25207.1523981210.git.amazo@checkvideo.com/
>
> Should I re-roll my patch without this change then?

If it's the question to me, then I'm fine either way -- I can rebase my changes easily. However, re-rolling your patch would probably make the aforementioned fileSize patch apply cleanly to both maint and master branches.

Thank you, Andrey Mazo

Previous: Luke Diamand
Message 10 of 10 in “git-p4: unshelving: fix problem with newer P4”
  1. 0/1 git-p4: unshelving: fix problem with newer P4Luke Diamand, May 22, 2018
  2. 1/1 git-p4: unshelve: use action==add instead of rev==noneLuke Diamand, May 22, 2018
  3. SZEDER GáborMay 22, 2018
  4. Luke DiamandMay 22, 2018
  5. Junio C HamanoMay 23, 2018
  6. 0/1 git-p4: unshelve: fix problem with newer p4dLuke Diamand, May 23, 2018
  7. 1/1 git-p4: add unshelve commandLuke Diamand, May 23, 2018
  8. Mazo, AndreyMay 23, 2018
  9. Luke DiamandMay 23, 2018
  10. Mazo, AndreyMay 23, 2018

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.