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

[Aleksey Nogin]

Script updates:
 - Include the "curry" branch in merge-all-branches

 - Merged the merge-branch-simple and the merge-branch scripts (to make it
   easier to maintain the two). Now the merge-branch-simple just sets the
   MERGE_SIMPLE flag and calls merge-branch.

 - Better handling of failures in the merge-branch script (for example, cases
   where the "svn merge" itself fails for some reason).

----
Changes in omake-branches/jumbo:
    +1 -1       merge-all-branches
    +27 -6      merge-branch
    Replaced    merge-branch-simple
    Added       merge-branch-simple
 
A hyperlinked version of this commit is available at
http://svn.metaprl.org/commitlogs/omake/2007-09.html#07/09/07.11:14:26