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

[Aleksey Nogin]

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