[Scummvm-devel] Release 1.3.0 schedule
Johannes Schickel
lordhoto at gmail.com
Wed Apr 20 20:57:45 CEST 2011
On Wed, Apr 20, 2011 at 8:06 PM, Marcus Comstedt <marcus at mc.pp.se> wrote:
>
> Johannes Schickel <lordhoto at gmail.com> writes:
>
>> Actually Tanoku (from github) told me that a cherry-pick might be
>> fine, though it is a very SVN style way of handling things. Seeing
>> that we want to start a release schedule tomorrow I don't think we
>> have enough time to decide on which proper workflow we want to use in
>> general.
>
> So which improper workflow do we want to use in particular then? :-)
>
> Generally, there are three ways of handling a fix that should be on
> both the branch and the trunk:
>
> * Make the fix on the branch, and cherry pick to trunk (exactly like
> what we used to do in svn)
> * Make the fix on the trunk, and cherry pick to the branch
In fact that is what we did back when we had SVN. :-P
> * Make the fix on a new branch, based on a commit before the branch
> was made, and merge this branch to both trunk and branch
>
No sure what to do.
// Johannes
More information about the Scummvm-devel
mailing list