Re: [Swig-devel] Missing entry - was Re: [Swig-cvs] SWIG CHANGES.current,1.495,1.496

[Marcelo M. <mm...@ac...>]

It seems it was a confusion between emacs, editing the new entry while
running cvs update in another windows, resolving the conflicts an of 
course, me.

Sorry.

Marcelo

William S Fulton wrote:

> Marcelo,
>
> Somehow you wiped this entry from the CHANGES.current file. Can you 
> make sure you merge the files before commiting? I thought cvs forced a 
> merge - it won't let me commit a file if it hasn't been update/merged. 
> Maybe you need to set some setting to ensure this happens??
>
> William
>
> William Fulton wrote:
>
>> Update of /cvsroot/swig/SWIG
>> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4811
>>
>> Modified Files:
>>     CHANGES.current Log Message:
>>
>>
>> Index: CHANGES.current
>> ===================================================================
>> RCS file: /cvsroot/swig/SWIG/CHANGES.current,v
>> retrieving revision 1.495
>> retrieving revision 1.496
>> diff -C2 -d -r1.495 -r1.496
>> *** CHANGES.current    22 Dec 2005 08:43:11 -0000    1.495
>> --- CHANGES.current    23 Dec 2005 00:16:08 -0000    1.496
>> ***************
>> *** 2,5 ****
>> --- 2,15 ----
>>   ===========================
>>   + 12/21/2005: wsfulton
>> +             [Java, C#]
>> +             Fix incorrect code generation when the intermediary 
>> classname is changed
>> +             in the module directive from its default. For example:
>> + +               %module(jniclassname="myimclassnewname") "mymodule" 
>> // Java
>> +               %module(imclassname="myimclassnewname") "mymodule" // C#
>> + +             Add in new special variable $imclassname. See docs.
>> +   12/21/2005: mmatus
>>         - The '-nodefault' flag (pragma and features) now generates
>> ***************
>> *** 230,234 ****
>>               Typesafe enums and proper enums have an extra 
>> constructor so that enum item values that
>>               are initialised by another enum item value can be 
>> wrapped without having to use %javaconstvalue/
>> !             %csconstvalue for when using %javaconst(1)/%csconst(1). 
>> Suggestion by Bob Marinier.
>>               For example:
>>   --- 240,246 ----
>>               Typesafe enums and proper enums have an extra 
>> constructor so that enum item values that
>>               are initialised by another enum item value can be 
>> wrapped without having to use %javaconstvalue/
>> !             %csconstvalue for when using %javaconst(1)/%csconst(1). 
>> Suggestion by
>> !             Bob Marinier/Douglas Pearson.
>> !               For example:
>>  
>>
>>
>> -------------------------------------------------------
>> This SF.net email is sponsored by: Splunk Inc. Do you grep through 
>> log files
>> for problems?  Stop!  Download the new AJAX search engine that makes
>> searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
>> http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
>> _______________________________________________
>> Swig-cvs mailing list
>> Swi...@li...
>> https://lists.sourceforge.net/lists/listinfo/swig-cvs
>>
>
>
>
> -------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc. Do you grep through log 
> files
> for problems?  Stop!  Download the new AJAX search engine that makes
> searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
> http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
> _______________________________________________
> Swig-devel mailing list
> Swi...@li...
> https://lists.sourceforge.net/lists/listinfo/swig-devel