[Omake] SVN Commit: OMake Build System (Rev. 9195)

[Aleksey Nogin]

On 23.05.2006 10:14, Jason Hickey wrote:

> Aleksey Nogin wrote:
> 
>> Should this also go into the regular 0.9.9 branch?
> 
> 
> Yes, it should. 

If I do it w/o any manual changes ("svn merge -r 9194:9195
svn+ssh://svn.metaprl.org/svnroot/mojave/omake-branches/0.9.9.port"), I
get a shift/reduce conflict from omake_ast_parse.mly :-(

> Actually, I'd prefer not to experiment on yet-another
> branch, but I'm not sure what the best scheme is.  Will think about it.

Yeah, with all the careful organization/commenting/planning we do on
every specific branch, it's amazing how quickly things tend to get
disorganized inter-branch :-(

-- 
Aleksey Nogin

Home Page: http://nogin.org/
E-Mail: nogin at cs.caltech.edu (office), aleksey at nogin.org (personal)
Office: Moore 04, tel: (626) 395-2200