Perforce branching from a Perforce branch?
I'm not convinced I understand your question, but I'll try to help If you're saying that you don't really want b. Txt in initialbranch, you can define a branch specification like this: initialbranch/a. Txt secondbranch/a.
Txt mainline/b. Txt secondbranch/b. Txt That way, when you integrate using the "secondbranch" branch spec, your changes in secondbranch will get pushed to initialbranch or mainline If you don't want to push changes directly from secondbranch to mainline, then do what it sounds like you are already doing: integrate b.
Txt from mainline to initialbranch, then from initialbranch to secondbranch. Work on it in secondbranch, then integrate the changes successively back to initialbranch and mainline.
I'm not convinced I understand your question, but I'll try to help. If you're saying that you don't really want b. Txt in initialbranch, you can define a branch specification like this: initialbranch/a.
Txt secondbranch/a. Txt mainline/b. Txt secondbranch/b.
Txt That way, when you integrate using the "secondbranch" branch spec, your changes in secondbranch will get pushed to initialbranch or mainline. If you don't want to push changes directly from secondbranch to mainline, then do what it sounds like you are already doing: integrate b. Txt from mainline to initialbranch, then from initialbranch to secondbranch.
Work on it in secondbranch, then integrate the changes successively back to initialbranch and mainline.
Thanks erickson - that's really helpful! – Dominic Rodger Oct 30 '08 at 13:07.
A,b------------------------------------------------------> mainline \ branched / integrated back in \-a----------------------------------/------------> initialbranch copied from mainline / -b-------------------/--------------> secondbranch Branching in perforce is inexpensive, so I would normally branch an entire directory structure rather than individual files. Its not too late to do this.As erickson says, rather than copy/add the file to secondbranch, you can just branch from mainline into your dev branches. A,b--------------------------------------------------> mainline \ branched \ / integrated back in \-a-----------\---------------------------/----> initialbranch \ branched from mainline / -b-----------------------------> secondbranch.
Another project comes along, which needs the changes from initialbranch. Now, say I want to make changes to b. Txt, and want to be able to integrate changes that happen both in initialbranch and in mainline.
At present, I'm branching from initialbranch (call this new branch secondbranch). Previously I've been adding b. Txt to initialbranch, and then integrating my changes across to secondbranch.
Is there a nicer way to do this? Sorry if this question seems somewhat convoluted, I've expressed it as best I can!
I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.