[Omake] Regenerating the Jumbo branches.

[Jason Hickey]

On Aug 3, 2007, at 10:07 AM, Aleksey Nogin wrote:

> Jason,
>
> Do you have any uncommitted merges on the Jumbo branches? If so,  
> please let me know when it's OK to start "messing" with them.

I need to merge the DynamicCLibrary stuff.

> Could you also update the DEPENDENCIES file? Currently, the list of  
> branches ends at dll2 and the changelog entries end at all- 
> features, so the "full route" to 0.9.9.x (AKA "everything"?) is not  
> given.

Sure.

> I have noticed that there are a number of merge problems (hopefully  
> minor ones) that have accumulated among the jumbo branches - files  
> that were not added properly (tests), properties that did not  
> propagate right (tests), files with conflicts committed (doc/src),  
> etc. I would like to generate a new set of jumbo branches "from  
> scratch" as copies of the current 0.9.8.x with appropriate patches  
> applied.

I believe most of these are in test, the biggest one is because of  
the recent rename from TestN to Test0N.  It requires a linear amount  
of work (in the number of branches) to fix these, so I haven't done it.

Also, I commit conflicts in doc/html to reduce the size of the  
commit.  The files are generated, so it is no big deal.

> Also, I am hoping to create my own setup for merging changes along  
> the branches to make sure each conflict only needs to be fixed once  
> (at the cost of extra commits).

Hmm, good luck.

One thought I have been having is to sort the tree into a line.

Jason

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