Re: git-p4: Importing a Git repository into Perforce without rebasing

From: Thomas Berg <merlin66b@gmail.com>
Date: Feb 19, 2013, 21:29 UTC
Message-ID: <CABYiQpnv6U2BVDB0v2Q3ia1x9FmYhNERDpE41TjE2qD5Y9L50A@mail.gmail.com>
In-Reply-To: <CAA5tD2sZiYcH+edbuO2Uh43zNUOyDYUO_JHpRhrLOjSqV-PfpA@mail.gmail.com>

Hi,

On Tue, Feb 19, 2013 at 3:40 AM, Russell Myers <mezner@russellmyers.com> wrote:

> I'm trying to take a Git repository which has never been in Perforce
> and push it to Perforce and having difficulty.

[...]

Show 5 quoted lines

> I know that I could create another Git repository that has some
> commits in it cloned from Perforce and rebase on top of that; however,
> the repository I'm trying to import is rather large and rebasing would
> require me to change many merge commits. I'd like to avoid doing this.
> The repository has many thousands of commits in it.

So your history is not linear and contains merges.

> In short my question is this: Using git-p4, is there a way to push a
> Git repository into Perforce without rebasing on top of commits coming
> from Perforce?

No, this is not supported. Non-linear history would be a problem for git-p4 too, so that alone wouldn't solve your problem. git-p4 does not have the logic needed to submit merges back to Perforce.

- Thomas