[Omake] SVN Commit: OMake Build System [0.9.8.x] (Rev. 10621)

[Jason Hickey]

Welcome to the world of branches, but now you are on the branch, not  
me:b

Remember how this started: you broke the compile for my 14  
outstanding branches.  Can you please not do that?

I'm just joking, of course you are right.

Still, see my comments.  After some thought, I think we should undo  
this thing entirely and start fresh.

Jason

On May 3, 2007, at 4:24 PM, Aleksey Nogin wrote:

> On 03.05.2007 16:10, Jason J. Hickey wrote:
>
>> Re-naming to match rev 10620.
> Jason,
>
> Can we please:
>  - Not jump between branches for incremental work on the same thing.
>  - When you do feel like working on the same branch, do _separate_  
> commits for branch merges and actual work.
>  - In general, when there are several branches, new stuff should go  
> to the most stable branch, where it applies. Otherwise we'll  
> invariably get back to the sad state, where a large number of  
> bugfixes are tied to more experimental code, making it harder to  
> migrate them back to the more stable branch.
>
> As far as I can tell, your rev. 10621 _both_ merges the rev. 10618  
> _and_ makes changes to it, reworking it the way you think is  
> better. The end result is that there is no obvious way to merge  
> your changes back to 0.9.8.2...
>
> Aleksey
> _______________________________________________
> OMake-Devel mailing list
> OMake-Devel at metaprl.org
> https://lists.metaprl.org/mailman/listinfo/omake-devel

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