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

[Aleksey Nogin]

If the repository root that was used to check out the jumbo branches does not
match the one in the omake:branch-parent (e.g.
svn+ssh://svn.metaprl.org/svnroot/mojave/ vs svn://svn.metaprl.org/), we need
to use the check-out one, not the omake:branch-parent one, otherwise svn will
complain (in cases where the changes being merged include any file adds).

----
Changes in omake-branches/jumbo:
    +5 -0       merge-branch
 
A hyperlinked version of this commit is available at
http://svn.metaprl.org/commitlogs/omake/2007-09.html#07/09/07.11:21:38