[p4] Propagating changes from branch to branch

Jason Perry jperry at choicestream.com
Mon Aug 10 17:35:07 PDT 2009


Hi,

I wanted to find out what you guys think is the best approach for this
scenario.

Mainline
Mainline -> Current Branch off of mainline
Mainline -> New Branch off of mainline after Current Branch

The ultimate end goal is to get a change made in the Current Branch to
Mainline and the New Branch

Approach 1
1. A required change is made on the Current Branch
2. The change is then integrated to Mainline from the Current Branch
3. The change is then integrated to the New Branch from the Current Branch

Approach 2
1. A required change is made on the Current Branch
2. The change is then integrated to Mainline from the Current Branch
3. The change is then integrated to the New Branch from Mainline

Is any of these approaches better than the other?  I am leaning more towards
Approach 2 because the integrations will be less conflicting.  With approach
1 though you only have to do one submission.

Let me know what you guys think.

Thanks,
Jay



More information about the perforce-user mailing list