On Thu, Sep 9, 2010 at 12:27 AM, Antonio Petrelli <[email protected]> wrote: > 2010/9/8 Nathan Bubna <[email protected]>: >> 2) Merge sandboxed Engine project(s) into the 2.x branch of Engine >> 3) Copy trunks of current projects into maintenance branches (e.g. >> 2.0.x branch for Tools) >> 4) Merge other sandboxed projects into their respective project trunks >> >> and i only say merge so that changes in the various trunks/branches >> that happened since you copied things off to the sandbox are not lost. >> i know there have been some Engine 2.x changes at least. i can't >> recall if Tools changed in that time. > > No, because classes are moved around in various places and in various > subdirectories that it would be too difficult (impossible?) to merge.
there aren't that many changes to Engine 2 and Tools 2 since you forked, and they need to be merged in one way or another. it doesn't have to be svn merge. > Antonio > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
