[oe] Merging .dreambox to .dev

[Stelios Koroneos]

I found some time today to work on getting .dreambox branch merged to .dev
This was more of an exercise on mtn and branches, as I am planning to work
on local branch for oplinux-0.3, that hopefully will get merged back to .dev
one day.

There are 2 problems with .dreambox (actually there are 3 but the last one
was expected) that mtn refers as non-content confilcts.
The first has to do with a number of files from the toolchain, that were
actually copied from .dev and not propagaded.
This results in having 2 files with the same name and no ansestor and mtn
does not like it at all.
The other problem is with files that were removed from .dev but still exist
on .dreambox
The third issue are the 3 way merges that need to be perfomed in order to
sync .dreambox to .dev in things like classes and some of the packages.

1 was handled by renaming the problematic files so they could servive the
merge and not create any problems
Most of the files in this case include toolchain related files.
2 was handled by removing/droping a few files from .dreambox. Fortunatelly
these files are some old buybox configs,so loosing their history I can
assume won't be a big issue
The 3rd issue and the one that could take a lot of time and effort are the 3
way merges required,which might be several


Stelios S. Koroneos

Digital OPSiS - Embedded Intelligence
http://www.digital-opsis.com