All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tor Arvid Lund <torarvid@gmail.com>
To: Kent Borg <kentborg@borg.org>
Cc: git@vger.kernel.org, "Alejandro Riveira Fernández" <ariveira@gmail.com>
Subject: Re: git-p4
Date: Sun, 12 Sep 2010 19:22:27 +0200	[thread overview]
Message-ID: <AANLkTi=yJ5kVA17+40xc6NpEczFjgmYh7=w5k=GL_U9w@mail.gmail.com> (raw)
In-Reply-To: <4C8CF231.6090403@borg.org>

2010/9/12 Kent Borg <kentborg@borg.org>:
> Firing up a Python session and manually running the git-p4
> findUpstreamBranchPoint() I get back something reminiscent of the commit
> I made at your suggestion:
>
>  ['remotes/p4/master', {'change': '160991', 'depot-paths':
> ['//depot/imgeng/sw/inferno/kernel/linux-2.6.33-quatro']}]
>
> I thought it looked reasonable, but when I try to run the git p4 summit,
> at line 811 in git-p4 it is doing:
>
>  git rev-list --no-merges remotes/p4/master..master

Ok, so if you call this on the cmd line, it should output sha1's on
all commits that will be submitted (in reverse order) to p4. If it
doesn't, this may well be a good place to dig for a solution.

Say that you have only one commit to submit to p4. We'll call it X.

The parent of X should then be the commit that remotes/p4/master is
pointing to. If it isn't, you can try to:

1) git checkout -b my_p4_branch p4/master
2) git cherry-pick X # we'll call this cherry-picked commit Y
3) git rev-list --no-merges remotes/p4/master..my_p4_branch
  * if it lists Y and only Y, try
4) git p4 submit

-Tor Arvid-

  reply	other threads:[~2010-09-12 17:22 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-10 19:54 git-p4 Kent Borg
2010-09-10 21:53 ` git-p4 Alejandro Riveira Fernández
2010-09-11 18:42   ` git-p4 Tor Arvid Lund
2010-09-12 15:30     ` git-p4 Kent Borg
2010-09-12 17:22       ` Tor Arvid Lund [this message]
2010-09-12 17:59         ` git-p4 Kent Borg
2010-09-12 19:54           ` git-p4 Tor Arvid Lund
2010-09-12 20:07             ` git-p4 Kent Borg
2010-09-12 20:12               ` git-p4 Tor Arvid Lund
2010-09-13 14:23                 ` git-p4 Kent Borg
2010-09-13 15:01                   ` git-p4 Tor Arvid Lund
2010-09-13 16:28                     ` git-p4 Kent Borg
2010-09-13 21:58                       ` git-p4 Tor Arvid Lund
2010-09-16 12:14                         ` git-p4 Kent Borg
2010-09-16 13:54                           ` git-p4 Tor Arvid Lund
  -- strict thread matches above, loose matches on Subject: below --
2008-09-07 13:17 git-p4 dhruva
2008-09-07 13:17 git-p4 dhruva

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='AANLkTi=yJ5kVA17+40xc6NpEczFjgmYh7=w5k=GL_U9w@mail.gmail.com' \
    --to=torarvid@gmail.com \
    --cc=ariveira@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=kentborg@borg.org \
    /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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.