Hi, I am new to CVS and I use WinCVS as the front end on a local
repository. I have a module with a main trunk. There is a branch
off that trunk that I use as experiment code. Is there a way to
merge the lastest changes on the main trunk to the branch code? I
don't want the experiment
On Thu, Aug 17, 2000 at 05:30:32PM -, [EMAIL PROTECTED] wrote:
Hi, I am new to CVS and I use WinCVS as the front end on a local
repository. I have a module with a main trunk. There is a branch
off that trunk that I use as experiment code. Is there a way to
merge the lastest changes
Mike Castle wrote:
So, for your situation, yuou have something like this:
Branch point
v
0+ Main
|
+--- Test
Now, hopefully you labled the branch point
with something when you created
the branch. Otherwise, this is a pain.
(Allow me to advertise
One of the tricks I sometimes use, to avoid having to keep track of branch
points, is to only merge from any given branch once. Thus, in this case,
I would create branch2 from the main trunk and merge the changes from the
first branch forward onto the new branch.
cvs up -A# get the main
Again, I think my "get date from file" patch would help here. Do
-jbranch:date:.last
right?
