Re: [WWdevel] WeBWorK 2.1.3 released

[Michael E. G. <ga...@ma...>]

Hi Gavin,

It's not stupid -- I had to relearn how to do it.

Check out a fresh copy of webwork2 using

cvs -d:ext:gl...@cv...:/webwork/cvs/system co -A 
webwork2

(I don't think you need the -A. but just in case.)

Then in the webwork2 directory do this:

cvs update -kk -j rel-2-1a

This will merge all of the 2.1a files with your copy of HEAD.  The -j 
means join and
keeps the HEAD files from just being over written.  The -kk means that 
certain
key variables at the top of the file are interpreted correctly so that 
you don't get
unnecessary collisions. (Without this EVERY file will appear to be 
changed, because
the version information has changed.)

Now you will have a number of files that need to be reconciled -- (they 
usually show up with a C
in front of them if you use   cvs -n update).  In these files you'll 
see sections like:

<<<<<<  UserList.pm
     old code
==========
    new code

 >>>>>>>>>> new version number

You need to check the changes you've made against changes that have 
been made by others and
reconcile them.  It can take some time I discovered. :-)

Once you are all done and if possible have been able to test the code 
locally you can use

cvs commit

to add all of these changed files back into the HEAD of webwork2.

Let me know if I can help.

Take care,

Mike

On Jun 10, 2005, at 4:14 PM, P Gavin LaRose wrote:

> Hi Mike,
>
>> John and Gavin -- go ahead and make your changes to the HEAD branch 
>> and
>> we'll start refining from there...
>
> Stupid question: how can I merge the changes from the rel-2.1a branch I
> was working in, into HEAD?
>
> Thanks,
> Gavin
>
> On Fri, 10 Jun 2005 at 16:07 Michael E. Gage wrote:
>
>> Hi all,
>>
>>
>> I have tagged all of the files currently in the CVS at rel-2-1-3.  All
>> of the changes have also been placed in the rel-2-1-patches branch as
>> well.  This instant the HEAD branch and the rel-2-1-patches branch are
>> the same, as best I can tell.
>>
>> John and Gavin -- go ahead and your changes to the HEAD branch and 
>> we'll
>> start testing and refining from there.  Sorry for the delay in getting
>> all the files in sync in the CVS -- it took longer than I thought.
>>
>> Those using WeBWorK for active classes should definitely not update 
>> from
>> the HEAD branch for a week or so while we get the bugs sorted out.
>>
>> Take care,
>>
>> Mike
>
> -- 
> P. Gavin LaRose, Ph.D.  Program Manager (Instructional Tech.)
> Math Dept., University of Michigan
> gl...@um...                        "There's no use in trying," 
> [Alice]
> 734.764.6454                             said. "One Can't believe 
> impossible
> http://www.math.lsa.umich.edu/~glarose/  things." "I daresay you 
> haven't had
>                                          much practice," said the 
> Queen.
>                                                               - Lewis 
> Carrol
>