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

[Aleksey Nogin]

On 11.04.2006 19:22, Jason Hickey wrote:

> 
> 
> Aleksey Nogin wrote:
> 
>>>       svn merge -r 8922:9051 
>>
>>
>> Did you really mean 0.9.6.shell, or was that 0.9.6.x?
> 
> 
> This is .shell.  The copy occurred at 9051, so there should be no 
> difference.

Well, the branching have happened at 8877, so if you are merging the 
shell branch, then you are only merging a part of the branch changes 
(since the shell branch was never merged into 9.7! )

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:...

For now, I would suggest reverting the last 0.9.7 revision and starting 
the merge from scratch (if you want, I'll be happy to do it). As far as 
merging the .om files (that often have different indentation level in 
different places), I usually take the diff, edit it to get the right 
indentation level and then apply the diff using patch.

-- 
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