Re: [Gm2] cvs latest changes

[Gaius Mulley]

john o goyo <address@hidden> writes:

> Gaius:
>
> I am somewhat confused about the state of the CVS archive.
>
> On 16-Jun-11, at 5:21 p, Gaius Mulley wrote:
>>
>> Hi,
>>
>> here are the latest changes on the 4.1.2 branch of gm2:
>>
>>     * gm2/gm2-compiler/PCSymBuild.mod:  fixed bug in deduceTypes
>>       so that binary constant expressions can correctly identify
>>       their types.  Fixes a bug report by Scott Iverson.
>
> Why is this change under Revision 1.8.2.1 and not the head?

Hi John,

I've been fixing the 1.x gm2 on the 4.1.2 branch and will at some
point merge the branch with the trunk.  Is this the wrong way to
do it?

I was following this simple example:

http://users.csc.calpoly.edu/~jdalbey/205/Resources/cvsBranchMerge.html

but I've not used branches for many years - so I'm very ready to listen
if there is a standard way to do this,

regards,
Gaius


>>
>>     * gm2/gccgm2.c:  gccgm2_GetArrayNoOfElements (New function).
>
> Checked in as Revision 1.203.2.1 but the head is Revision 1.203.
>
>>     * gm2/gm2-compiler/M2GenGCC.mod:  checkArrayElements (New
>>       procedure function).  CodeBecomes modified to call
>>       checkArrayElements to test whether assigned arrays contain
>>       the same number of elements.
>
> Checked in as Revision 1.142.2.1 but the head is Revision 1.142.
>
>>     * gm2/gm2-compiler/M2Quads.mod:  CheckBecomesMeta tidied up
>>       error messages and added extra check to ensure that
>>       we are not assigning from an unbounded array.
>
> Checked in as Revision 1.189.2.2 but the head is Revision 1.190.
>
>>     * gm2/gccgm2.def:  export GetArrayNoOfElements.
>>       Fixes a bug reported by Scott Iverson.
>
> Checked in as Revision 1.74.2.1 but the head is Revision 1.74.
>
> Similarly, the latest Changelog is Revision 1.757.2.4 but the head is
> Revision 1.759.
>
> I usually check out the head, consequently I have been missing all
> these changes.
>
> john