Re: git-p4
- From
Tor Arvid Lund <torarvid@gmail.com>
- Date
- Sep 12, 2010, 17:22 UTC
- Message-ID
- <AANLkTi=yJ5kVA17+40xc6NpEczFjgmYh7=w5k=GL_U9w@mail.gmail.com>
- In-Reply-To
- <4C8CF231.6090403@borg.org>
2010/9/12 Kent Borg <kentborg@borg.org>:
Show 11 quoted lines
> 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..masterOk, 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-