From: "Alejandro Riveira Fernández" <ariveira@gmail.com>
To: Kent Borg <kentborg@borg.org>
Cc: linux-kernel@vger.kernel.org, git@vger.kernel.org
Subject: Re: git-p4
Date: Fri, 10 Sep 2010 23:53:23 +0200 [thread overview]
Message-ID: <20100910235323.773d2c5b@varda> (raw)
In-Reply-To: <4C8A8CE8.90600@borg.org>
El Fri, 10 Sep 2010 15:54:16 -0400
Kent Borg <kentborg@borg.org> escribió:
[ CCing git mailing list. Looks like a better place to ask this question]
> I have a git-p4 question: I work in a Perforce shop and am doing Linux
> kernel work, I need to share that work with colleagues who see the world
> as a Perforce place. The kernel I have came from Linus' tree and has a
> lot of history. When I try to do my first a "git p4 submit" it chokes
> as it looks back in the entire git history until it fails looking for
> the ancestor of the first commit (linux-2.6.12-rc2!), I think it is
> looking for the last time it did a git-p4 submit so it knows how far
> back to go--but it has never done a submit in this new relationship
> between p4 and git. There is plenty of git history that is not
> reflected in p4, and I don't want it in p4, I just want new work in p4.
>
> I fear that git-p4 is for git people to contribute to bits natively
> p4-homed code, not this case where the code is natively git-homed code
> and it is the p4 people who will be contributing bits.
>
> My attempt at a work around was this:
>
> - create a director on the p4 side, and from the p4 side submit the
> files that match my latest git submit.
>
> - sync with git-p4
>
> - try to submit a file with git-p4...and that fails as it runs all the
> way back through the history. (Thank goodness it didn't succeed in
> submitting kernel activity since 2005!)
>
>
> I was hoping I could merge the p4/master with master to force a stopping
> point in the git-p4 submit, but that doesn't work, it is searching
> through git history to find the stopping point. What might I put in the
> git history to force the stop (or maybe make a change to git-p4 to help
> my plight along)?
>
>
> Thanks,
>
> -kb, the Kent who has always hated Perforce, alas.
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
next parent reply other threads:[~2010-09-10 21:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4C8A8CE8.90600@borg.org>
2010-09-10 21:53 ` Alejandro Riveira Fernández [this message]
2010-09-11 18:42 ` git-p4 Tor Arvid Lund
2010-09-12 15:30 ` git-p4 Kent Borg
2010-09-12 17:22 ` git-p4 Tor Arvid Lund
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
2008-09-07 13:17 git-p4 dhruva
-- strict thread matches above, loose matches on Subject: below --
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=20100910235323.773d2c5b@varda \
--to=ariveira@gmail.com \
--cc=git@vger.kernel.org \
--cc=kentborg@borg.org \
--cc=linux-kernel@vger.kernel.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 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 NNTP newsgroup(s).