On 06/23/2014 09:38 AM, Owain Davies wrote: > Hi, > > Can somebody explain how you manage the seandroid brances? > Obviously seandroid tracks aosp/master and I can see that the > aosp/master branch is regularly merged into seandroid. However, it is > not immediately obvious how you maintain the stable branches that follow > the release tags. > > Initially I though you rebased (cherry-picked) your work from the > seandroid branch onto the relevent release tag. However, I now see that > it is not that because there are commits in the seandroid branch that do > not appear in the release branches.
For the release branches (at least the recent ones, e.g. seandroid-4.4.3 and -4.4.4), we have cherry-picked SE-related changes from AOSP master onto the relevant release tag and then refactored residual differences from our seandroid branch into a set of logical changes on top (this in turn will often generate a set of changes back to our seandroid branch to eliminate cruft, obsolete changes, etc). Then we continue to cherry-pick further changes from AOSP master (as development is primarily occurring directly against master these days) as they are merged. We only keep maintaining the release branch in general until shortly after the next release branch is created, at which point we switch over to the next release branch for further maintenance. > I have looked at the stable branches and there are some common commits, > but again they are not identical. > > My problem is that I am working on a project that follows the seandroid > branch for development but now I want to make a stable release based on > the release branch. > > Do you have any scripts to assist in the merges? No, I'm afraid it is a manual process. Which release branches do you care about? Certainly open to suggestions on better/alternative ways of managing the branches, although I'm hoping/expecting that the delta is going to be vastly reduced once the next major release of Android is made. _______________________________________________ Seandroid-list mailing list [email protected] To unsubscribe, send email to [email protected]. To get help, send an email containing "help" to [email protected].
