Hi again, crosswalkittens, There's another versioning-related issue we need to talk about. At the moment, the crosswalk repository has two branches:
o master, the development branch that never gets frozen and is soon going to move from 1.29.x.y to 2.31.x.y and track a new Chromium milestone. o crosswalk-1, the current stable branch that is supposed to keep tracking Chromium milestone 29 and is going to become our first stable release. Our Blink and Chromium forks, which Crosswalk depends on, have the following branches: o master, the development branch used by crosswalk's master branch. o master_history_28_0_1490_0, master_history_28_0_1500_36 are "snapshots" of master when it was tracking previous Chromium releases. We keep them around mainly to preserve history, as each time we rebase master we lose our merge commits and sometimes remove fork-specific commits that are not relevant anymore. o upstream_28_0_1500_36, upstream_29_0_1547_57 are pristine copies of the upstream chromium.org branches corresponding to those Chromium releases. As a corollary, the master_* branches contain our commits on top of the upstream_* branches. These 5 branches above are all related to Crosswalk master, and do not take Crosswalk's stable branch into account. This has worked so far because both crosswalk-master and crosswalk-stable are currently tracking the same Chromium 29 release and milestone, but master is soon going to switch to Chromium M31, and we need to adjust our forks for that. o Should we create crosswalk-1_29_0_1547_57 or something like that? o master_* branches are not good names, as at some point they are not going to be used by master anymore. o Should we get rid of the upstream_* branches or are they really needed? _______________________________________________ Crosswalk-dev mailing list Crosswalk-dev@lists.crosswalk-project.org https://lists.crosswalk-project.org/mailman/listinfo/crosswalk-dev
