How do I configure p4 to integrate the engine code from one stream into the game stream?

Development Pipeline & Plugins
,
1

I have a depot with two streams. One called ue5 and one called main. My game lives in main and I’ve submitted 5.6.1 (the entirety of the github repo) to ue5. I’m setting it up this way to simplify engine upgrades later such that I can simply update from github, submit those changes to p4, and then integrate them into the game branch.

I’m at the point where I’m trying to do a first integration from the engine stream into the main stream but I can’t figure out how to do it. When I try, I get a bunch of File(s) not in client view errors for everything I’m trying to integrate. Do I need to do a p4 copy first or something or have I just not set up/configured my streams correctly?

2

I think I might have figured it out. I created a branch mapping and I think that’s working. It hasn’t immediately failed anyway. I’ll report back.

3

Yeah, the branch mapping did the trick.