Re: [Emc-developers] Ready to merge classicladder 7.124 to trunk

[Chris R. <ch...@ti...>]

On Tue, Feb 26, 2008 at 12:31:41AM +0000, Chris Morley wrote:
> 
> Greetings.
> 
> I now have Classicladder 7.124 stable and usable . I think the statusbar really helps for usability.
> I still have not tried the modbus interface but it can compiled out, fairly easily if need be.
> I would like to merge it into trunk.
> What is the procedure? Am I to do this or does the Chief do it? 
> If it is me I'll have to find out how. I will read about merges on the net now.....
> 

There is no chief!  By all means if you think it's ready, merge it
into trunk so everyone will get it.  It's very easy with cvs up
-jbranch.  I tried and there are only a few tiny conflicts you will
have to fix.  It looks like they are only because of whitespace
differences.

If you put changes in trunk that require changes to existing configs,
please document the procedure for the required fixup here:

http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?UpdatingConfigurationsForDevelopmentVersions

Chris