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

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

[Russell Myers]

Hello,

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

It would appear that git-p4 requires that a repository is cloned using
"git p4 clone" in order to use it to push back to Perforce. That would
not be the case here as the repository in question has never been
tracked by Perforce.

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.

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?

Thanks,

Russell Myers

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

[Thomas Berg]

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.
[...]
> 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

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

[Enrico Weigelt]

Hi,

<snip>

perhaps you should give Perfoce's git-bridge a try.


cu
-- 
Mit freundlichen Grüßen / Kind regards 

Enrico Weigelt 
VNC - Virtual Network Consult GmbH 
Head Of Development 

Pariser Platz 4a, D-10117 Berlin
Tel.: +49 (30) 3464615-20
Mobile: +49 (151) 27565287
Fax: +49 (30) 3464615-59

enrico.weigelt@vnc.biz; www.vnc.de