If upstream does merges from us, then it can be bidirectional. However, probably they'd want something more organized. (Emscripten requires pull requests to be rebased, for example.)
For our own development history to be best preserved, it's better to merge, I think. That's what pnacl does with llvm and clang, and what we do with pnacl. - Alon On Mon, Dec 29, 2014 at 12:14 PM, Jukka Jylänki <[email protected]> wrote: > Hmm, I suppose yes. Although I wonder if we are possibly ending up in > merges going bidirectionally across repositories (next time we merge > upstream, the merge will contain our merges), that is sometimes considered > bad. I wonder how large scale development typically handles these kind of > cases? > > 2014-12-29 21:17 GMT+02:00 Alon Zakai <[email protected]>: > >> Great! >> >> Should we merge upstream to emscripten ports? ( >> https://github.com/emscripten-ports/SDL2 ) >> >> - Alon >> >> >> On Mon, Dec 29, 2014 at 7:15 AM, Jukka Jylänki <[email protected]> wrote: >> >>> Hi there, >>> >>> just dropping a quick note - the work on the Emscripten branch of SDL2 >>> has been merged to upstream SDL2 trunk. See the changeset here: >>> https://hg.libsdl.org/SDL/rev/8900afb78a19 >>> >>> If you are using your existing SDL2 setup from another fork, nothing >>> probably changes for you. However, this might considerably ease development >>> for those who build SDL2 for multiple targets simultaneously, since you may >>> not need to use multiple separate repos for building. >>> >>> Thanks to Ryan Gordon for working on the merge, and everyone else who's >>> been involved so far! >>> >>> Jukka >>> >>> -- >>> You received this message because you are subscribed to the Google >>> Groups "emscripten-discuss" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to [email protected]. >>> For more options, visit https://groups.google.com/d/optout. >>> >> >> -- >> You received this message because you are subscribed to the Google Groups >> "emscripten-discuss" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to [email protected]. >> For more options, visit https://groups.google.com/d/optout. >> > > -- > You received this message because you are subscribed to the Google Groups > "emscripten-discuss" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "emscripten-discuss" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
