[Omake] Merging

[Jason Hickey]

On Apr 22, 2007, at 10:12 AM, Aleksey Nogin wrote:

> Jason,
>
> We should probably release 0.9.8.2 before we start merging

Ok.

> For the actual merge, I would propose extracting some first set of
> patches (do I just diff the appropriate jumbo-branches for that?)

That's right.  I don't have a full git log because of all the times I  
had to rebuild the git version from svn (in fact, I now just use a  
script to rebuild them all).  In the end, svn is the master copy, but  
svn merge won't work.  You have to diff by hand.  The branch  
dependencies listed are in the DEPENDENCIES file.

Jason

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