[Scummvm-devel] Release 1.3.0 schedule
Marcus Comstedt
marcus at mc.pp.se
Wed Apr 20 21:17:44 CEST 2011
Tarek Soliman <tarek-spam at zeusmail.bounceme.net> writes:
>> * Make the fix on the branch, and cherry pick to trunk (exactly like
>> what we used to do in svn)
> The original proposal was a variation of this where the assumption
> was that there were no commits on the branch that were not on trunk.
But that assumption does not hold, so the proposal is moot.
>> * 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
> What branch would that "fix" branch be forked off of?
Ideally, the merge base (see "git merge-base") of branch and trunk.
In practice, you'd probably do the fix on either of these branches and
then rebase it.
> I think between gitk (for GUI) and tig (for CLI) you can read little bumps.
Yes, but just because you _can_ does not make it pleasant. bzr does a
much better job of logging merges, IMO.
// Marcus
More information about the Scummvm-devel
mailing list