[cvsnt] Questions regarding Branches and Merge

[Yin Shi]

Hello all,

 

I am using CVSNT 1.11.1.3 with Websphere 5.1.1, and everything went well until I encountered this kind of problem.

 

I would like to split my current project off into two separate lines of development, and basically, there are a lot of codes are the same on these two (now I have two projects).  I am using different branches to merge the changes, however, when I separate the project into two, it is hard to do it.  For example P1 and P2, there is a branch B1 associated with P1, if I made some changes on B1, and I am able to merge them into P1 with no problem, and I want to merge the changes to P2 as well (because the changes is also needed for P2), I am not able to do it, 'cause B1 is not related to P2.  I don't know how to solve this, does anyone know the solution?  Thanks so much for the help.

 
Thanks  


Yin Shi
Cincinnati, OH 45202
		
---------------------------------
Do you Yahoo!?
vote.yahoo.com - Register online to vote today!