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

Re: [PATCHv1 2/3] git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved

From
Luke Diamand <luke@diamand.org>
Date
Oct 15, 2018, 11:03 UTC
Message-ID
<CAE5ih78u7n_A+cYXQO+Pt6K48_WaNnrxwHMK0JeHNG6pp3f8Xw@mail.gmail.com>
In-Reply-To
<CAE5ih7_sT8aP7n6h0moEj=6JjRAGJ+AXUCDkTFoJmnbE_Nh1mA@mail.gmail.com>
On Fri, 12 Oct 2018 at 19:19, Luke Diamand <luke@diamand.org> wrote:
Show 37 quoted lines
>
> On Fri, 12 Oct 2018 at 14:45, Junio C Hamano <gitster@pobox.com> wrote:
> >
> > Luke Diamand <luke@diamand.org> writes:
> >
> > > The branch detection code looks for branches under refs/remotes/p4/...
> > > and can end up getting confused if there are unshelved changes in
> > > there as well. This happens in the function p4BranchesInGit().
> > >
> > > Instead, put the unshelved changes into refs/remotes/p4-unshelved/<N>.
> >
> > I am not a p4 user (and not a git-p4 user), so it is a bit hard for
> > me to assess if this is a backward incompatibile change and if so
> > how serious potential breakage to existing users would be.
>
> I don't think it's a particularly serious breakage - it reports the
> branch it unshelves to, so it should be fairly obvious.
>
> However, maybe it would make sense to pull this into a separate commit
> to make it more obvious? I should have thought of that before
> submitting.
>
> >
> > >
> > > -If the target branch in refs/remotes/p4/unshelved already exists, the old one will
> > > +If the target branch in refs/remotes/p4-unshelved already exists, the old one will
> > >  be renamed.
> > >
> > >  ----
> > >  $ git p4 sync
> > >  $ git p4 unshelve 12345
> > > -$ git show refs/remotes/p4/unshelved/12345
> > > +$ git show p4/unshelved/12345
> >
> > Isn't this "p4-unshelved/12345" now?
>
> Yes, I think another reason to pull into a separate commit.

D'oh. It's already in a separate commit. I'll re-roll fixing that documentation.

I think it will be fine to change the branch that the unshelving happens into - I think it's very unlikely anyone is basing some automated scripts on this, because of the way that unshelving is used anyway.

Luke
Previous: Luke DiamandNext: Luke Diamand
Message 6 of 7 in “[PATCHv1 0/3] git-p4: improved unshelving”
  1. Luke DiamandOct 12, 2018
  2. 1/3 git-p4: do not fail in verbose mode for missing 'fileSize' keyLuke Diamand, Oct 12, 2018
  3. 2/3 git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelvedLuke Diamand, Oct 12, 2018
  4. Junio C HamanoOct 12, 2018
  5. Luke DiamandOct 12, 2018
  6. Luke DiamandOct 15, 2018
  7. 3/3 git-p4: fully support unshelving changelistsLuke Diamand, Oct 12, 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.