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

Jason Hickey jyh at cs.caltech.edu
Tue Apr 11 20:00:02 PDT 2006


Aleksey Nogin wrote:
> What needed to be merged is:
> - 0.9.6.x changes 8922:9059
> - 0.9.6.shell changes 8877:9048 (this intentionally skips 9049, which 
> merged .x into .shell)
> - 0.9.8.x changes 9051:...

Whaa!  This is so confusing.  Well I should let you do it.  If we could 
only avoid nontrivial branches and merges:(

Note that the 0.9.7 commit (which will be rolled-back), contains some 
code we will need, but I am happy to do it once the merge happens.

Jason

-- 
Jason Hickey                  http://www.cs.caltech.edu/~jyh
Caltech Computer Science      Tel: 626-395-6568 FAX: 626-792-4257



More information about the OMake-Devel mailing list