From: Luke Diamand <luke@diamand.org>
To: Miguel Torroja <miguel.torroja@gmail.com>
Cc: Git Users <git@vger.kernel.org>,
Lars Schneider <larsxschneider@gmail.com>,
gvanburgh@bloomberg.net
Subject: Re: [PATCH 1/1] git-p4: add unshelve command
Date: Thu, 22 Feb 2018 22:28:16 +0000 [thread overview]
Message-ID: <CAE5ih79E1Z8h+hAgr8zCw7=Dtec6sxT7Xf4cWn8zOLNs=mY1jg@mail.gmail.com> (raw)
In-Reply-To: <CAKYtbVYe5hHDXf=nQzt6r9N20CrTgbEMbBS0JBBXQLpz+BVu1A@mail.gmail.com>
On 22 February 2018 at 21:39, Miguel Torroja <miguel.torroja@gmail.com> wrote:
> Hi Luke,
>
> I really like the idea of creating a branch based on a shelved CL (We
> particularly use shelves all the time), I tested your change and I
> have some comments.
>
> - I have some concerns about having the same "[git-p4...change =
> .....]" as if it were a real submitted CL.
> One use case I foresee of the new implementation could be to
> cherry-pick that change on another branch (or current branch) prior to
> a git p4 submit.
OK, I think we could just not add that in the case of an unshelved commit.
>
> - I see that the new p4/unshelve... branch is based on the tip of
> p4/master by default. what if we set the default to the current HEAD?
There's a "--origin" option you can use to set it to whatever you want.
I started out with HEAD as the default, but then found that to get a
sensible diff you have to both sync and rebase, which can be quite
annoying.
In my case, in my early testing, I ended up with a git commit which
included both the creation of a file, and a subsequent change, even
though I had only unshelved the subsequent change. That was because
HEAD didn't include the file creation change (but p4/master _did_).
>
> - Shelved CLs can be updated and you might have to run "git p4
> unshelve" a second time to get the latest updates. if we call it a
> second time it fails as it's trying to update p4/unshelve... rather
> than discarding previous one and creating a new one.
OK, that should also be fixable.
>
>
> Thanks,
Thanks for the feedback, very useful! I'll reroll.
Luke
next prev parent reply other threads:[~2018-02-22 22:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-22 9:50 [PATCH 0/1] git-p4: add unshelve command Luke Diamand
2018-02-22 9:50 ` [PATCH 1/1] " Luke Diamand
2018-02-22 21:39 ` Miguel Torroja
2018-02-22 22:28 ` Luke Diamand [this message]
2018-02-23 17:22 ` Luke Diamand
2018-02-24 12:50 ` Miguel Torroja
-- strict thread matches above, loose matches on Subject: below --
2018-05-12 21:24 [PATCHv2 0/1] add git-p4 " Luke Diamand
2018-05-12 21:24 ` [PATCH 1/1] git-p4: add " Luke Diamand
[not found] ` <1378098185.1161438.1526219571066@mail.yahoo.com>
2018-05-16 20:48 ` Luke Diamand
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='CAE5ih79E1Z8h+hAgr8zCw7=Dtec6sxT7Xf4cWn8zOLNs=mY1jg@mail.gmail.com' \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=gvanburgh@bloomberg.net \
--cc=larsxschneider@gmail.com \
--cc=miguel.torroja@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).