This is certainly possible with CVS. The key is to determine if you have
ever merged changes from the Branch Y back to the Main. If so, then you
have to Join the changes between two points (two -j flags on the cvs
update). The problem with CVS is that it doesn't keep track of the last
time you merged. So you have to keep track of this with static tags.
If not, then you can simply update to the Main and join in the changes from
Branch Y.
1) Update to the Main:
cvs update -r Main
2) Join the changes from Branch Y onto the Main branch
cvs update -j branch_y
Another thing that you can do is use the -n command on the cvs command line
to "see what would happen if you execute the command". This flag tells cvs
to execute the command, but don't really do it. That way, you can be sure.
For example:
cvs update -r Main (update to the Main)
cvs -n update -j branch_y (see what would happen if you really executed the
command).
Hope this helps.
Matt
-----Original Message-----
From: Manoj Kumar Rana [mailto:[EMAIL PROTECTED]]
Sent: Saturday, September 16, 2000 10:10 AM
To: [EMAIL PROTECTED]
Subject: Help Requested
Hi,
I am currently working on a Branch of a Branch of Main Tree, and I am
required to submit my changes to main tree now, without distrubing the
intermediate branch. I am new to using the CVS, and cannot experiment as
the time limit is very close, and I can not afford to make mistake.
For your understanding, I am explaining the problem graphically:
Main_Tree------------------------>
|_________.Branch X
|________________> Branch Y
Branch X is a stable release.. and I cannot change any files in that.
I am working on Branch Y.
I want to merge my changes to Main Tree.. which has gone heavily changed
after the Branch X.
Please suggest the way to do this.
Quick and reply containing commands are highly appreciated ..as I am a new
to CVS.
Though any slightest hint is also required and appreciated.
Thankx in advance.
Rana.
