Forwarded message:
From: Self <KendallB>
To: Brian Paul <[EMAIL PROTECTED]>
Subject: Re: [Mesa-dev] branching plans
Date: Wed, 10 Nov 1999 19:41:16 -0800
Hi Brian,
> I plan on creating the 3.2 development branch today.
> The branch tag will be mesa_3_2_dev.
> When Mesa 3.1 is released I'll tag that branch's sources mesa_3_1.
> When Mesa 3.2 is released I'll tag that branch's sources mesa_3_2.
Ok. I just checked in a bunch of changes into the 3.1 development
branch that I would like to see in the 3.2 branch. How do we go about
merging those changes between the two branches? Then I will continune
working in the 3.2 branch for the time being (as we are trying to get
a stable build together for the MGL 5.0 release).
I finally got my Perforce->CVS program working so that it will allow
me to sync up with CVS, check the changes into Perforce and allow me
to automatically merge stuff back and forth between our development
tree and the CVS tree. Works great!
However I do have one question. Is there a way to force CVS to do an
update in a specific directory, but have it diff the files in the
directory and only update those files that have actually been
changed?
The reason I need this is because CVS works exclusively on date and
time checks to determine what needs to be updated, but Perforce does
(and hence once the files are in Perforce, CVS thinks they have *all*
been changed!). Of course when I do a commit, only the actual changed
files get comitted.
Regards,
+---------------------------------------------------------------+
| SciTech Software - Building Truly Plug'n'Play Software! |
+---------------------------------------------------------------+
| Kendall Bennett | Email: [EMAIL PROTECTED] |
| Director of Engineering | Phone: (530) 894 8400 |
| SciTech Software, Inc. | Fax : (530) 894 9069 |
| 505 Wall Street | ftp : ftp.scitechsoft.com |
| Chico, CA 95928, USA | www : http://www.scitechsoft.com |
+---------------------------------------------------------------+
_______________________________________________
Mesa-dev maillist - [EMAIL PROTECTED]
http://lists.mesa3d.org/mailman/listinfo/mesa-dev
